summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Clear mIgnoreDirtyState after drawJohn Reck2014-04-162-3/+5
| | | | Change-Id: I6dfb39e0ebc9a5732678d735d9bc5e8813926096
* Merge "Revert "Import translations. DO NOT MERGE""Baligh Uddin2014-04-1656-84/+0
|\
| * Revert "Import translations. DO NOT MERGE"Baligh Uddin2014-04-1656-84/+0
| | | | | | | | | | | | This reverts commit bcf6441e61725a2e6c04d03de43d209311da9d3a. Change-Id: I8b556dfaeb45434e194503fe5ae77e744637f6c2
* | Merge "Write eventlog entries for notification visibility"Christoph Studer2014-04-166-0/+148
|\ \
| * | Write eventlog entries for notification visibilityChristoph Studer2014-04-166-0/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep track of notifications shown in the notification panel and log them via eventlog. Added the following eventlog tag: * notification_visibility_changed Bug: 13442201 Change-Id: Ifb74ec2492967dc787b4de86db7d7f00be6c7f74
* | | am e65c292a: (-s ours) am f104f676: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2014-04-160-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into klp-modular-dev * commit 'e65c292a5e7f4d70a43f965909647f89bb46809d': Import translations. DO NOT MERGE
| * \ \ am f104f676: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2014-04-160-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit 'f104f676e375c5c53eb049705740ab592b914bda': Import translations. DO NOT MERGE
| | * \ \ Merge "Import translations. DO NOT MERGE" into klp-modular-devBaligh Uddin2014-04-1656-18/+132
| | |\ \ \
| | | * | | Import translations. DO NOT MERGEBaligh Uddin2014-04-1456-18/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I06501e9574457274ef7b0a3951a1d76b8c50fdac Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-04-1656-0/+84
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-1456-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I06d9b9dea39d302df5f59242be6372413f854e3a Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-04-161-3/+3
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-141-3/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1d43a2f0495c5744cfea7c9a5932522c50f7492a Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-04-1656-0/+277
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-1456-0/+277
| |/ / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I0c4a5560a6d7955bb97b50ef882ba11acc0760fd Auto-generated-cl: translation import
* | | | | Merge "Revert "Revert "Define new general permission APIs for webview."""Ben Murdoch2014-04-164-0/+117
|\ \ \ \ \
| * | | | | Revert "Revert "Define new general permission APIs for webview.""Tao Bai2014-04-154-0/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e0a7b08d369e323f524251a44251c902122a6414. Change-Id: Ieba5a72524e43eb5e2fccb39647fd11e9d9494c8
* | | | | | Merge "Handle the failure of session creation request in TvInputManagerService."Dongwon Kang2014-04-161-13/+23
|\ \ \ \ \ \
| * | | | | | Handle the failure of session creation request in TvInputManagerService.Dongwon Kang2014-04-161-13/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14073508 Change-Id: Idc9da323bb0000300faf662c7db031214ae6136c
* | | | | | | Merge "Fix action bar theme inheritance and icons, make colors public"Alan Viverette2014-04-165-10/+31
|\ \ \ \ \ \ \
| * | | | | | | Fix action bar theme inheritance and icons, make colors publicAlan Viverette2014-04-155-10/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Theme.Quantum.Light.DarkActionBar is still broken, but fix incoming. BUG: 14084633 BUG: 14083272 Change-Id: Id5f2f9ce5b0af741fc79d1fb325cfee74c7a1e37
* | | | | | | | Merge "Add 'read' subcommand to the 'content' tool."John Spurlock2014-04-161-0/+61
|\ \ \ \ \ \ \ \
| * | | | | | | | Add 'read' subcommand to the 'content' tool.John Spurlock2014-04-151-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Access raw content exposed by content provider openFile uris. Bug:14079104 Change-Id: I9ef0e19f9354fa12408df1583b211a8d8a2e9fdb
* | | | | | | | | Merge "Don't crash if a null key is passed for verification/parsing"Christopher Tate2014-04-151-7/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't crash if a null key is passed for verification/parsingChristopher Tate2014-04-151-7/+11
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I77c496d9d86d2831a4166a924afe1493aa0ac0ce
* | | | | | | | | am da34482d: am 56a90cb8: Merge "Set wearable specific strings in framework" ↵Vinod Krishnan2014-04-151-0/+5
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-modular-dev * commit 'da34482dfc879e741f1ab2f64a0c1741640186da': Set wearable specific strings in framework
| * | | | | | | | am 56a90cb8: Merge "Set wearable specific strings in framework" into ↵Vinod Krishnan2014-04-151-0/+5
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit '56a90cb8e1a136d6367c0006bf8689fcc97211cb': Set wearable specific strings in framework
| | * | | | | | | Merge "Set wearable specific strings in framework" into klp-modular-devVinod Krishnan2014-04-151-0/+5
| | |\ \ \ \ \ \ \
| | | * | | | | | | Set wearable specific strings in frameworkVinod Krishnan2014-04-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I81e7d55c53809199a340c9c16070b55ffbaeefc0
* | | | | | | | | | am 5c04c4e7: am 6ced3b34: am 0d54e471: Merge "Remove code markers"Dmitriy Ivanov2014-04-152-34/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5c04c4e7b5f9dc76afe180c0b6a0901119834fcf': Remove code markers
| * | | | | | | | | am 6ced3b34: am 0d54e471: Merge "Remove code markers"Dmitriy Ivanov2014-04-152-34/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6ced3b34f02f353c0d3445775132aa9cbf40b160': Remove code markers
| | * \ \ \ \ \ \ \ \ am 0d54e471: Merge "Remove code markers"Dmitriy Ivanov2014-04-152-34/+1
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0d54e471fa90c2759e86dc47c642f7af277a50f0': Remove code markers
| | | * \ \ \ \ \ \ \ \ Merge "Remove code markers"Dmitriy Ivanov2014-04-152-34/+1
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Remove code markersDmitriy Ivanov2014-04-152-34/+1
| | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2defbdeddca39685194751022e6dcb5f1a48a0e9
* | | | | | | | | | | | am 45f232cf: am 7ba3b3f4: am fe0996b7: am 60095240: docs: Updated the gradle ↵quddusc2014-04-151-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | build number to 4.3.23. Bug: 14043082 * commit '45f232cf579a1b4f8e32da08f17b7b7eb20ddc18': docs: Updated the gradle build number to 4.3.23. Bug: 14043082
| * | | | | | | | | | | am 7ba3b3f4: am fe0996b7: am 60095240: docs: Updated the gradle build number ↵quddusc2014-04-151-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to 4.3.23. Bug: 14043082 * commit '7ba3b3f4c87d891a2e8b55f68efd169392ff62af': docs: Updated the gradle build number to 4.3.23. Bug: 14043082
| | * | | | | | | | | | am fe0996b7: am 60095240: docs: Updated the gradle build number to 4.3.23. ↵quddusc2014-04-151-2/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14043082 * commit 'fe0996b7c09606fab0c1645d6c329cadf4d82841': docs: Updated the gradle build number to 4.3.23. Bug: 14043082
| | | * \ \ \ \ \ \ \ \ \ am 60095240: docs: Updated the gradle build number to 4.3.23. Bug: 14043082quddusc2014-04-151-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '60095240e2a1b1c96ee4caf6cd7e9e1fa38acbb8': docs: Updated the gradle build number to 4.3.23. Bug: 14043082
| | | | * | | | | | | | | | docs: Updated the gradle build number to 4.3.23.quddusc2014-04-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14043082 Change-Id: I8068f34b2533631b16dbaeaae3a0465088cc5aaf
* | | | | | | | | | | | | | am 2aa70413: am 76b66a9a: am 2b4d89b7: am eca07bfa: Merge "Doc change: ↵Katie McCormick2014-04-153-55/+1677
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update CCS doc with new quota info." into klp-docs * commit '2aa704133a914f4a8455862d74cc450b267f1b9a': Doc change: Update CCS doc with new quota info.
| * | | | | | | | | | | | | am 76b66a9a: am 2b4d89b7: am eca07bfa: Merge "Doc change: Update CCS doc ↵Katie McCormick2014-04-153-55/+1677
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with new quota info." into klp-docs * commit '76b66a9ae7a894dd30a3bab56dedb537a904157b': Doc change: Update CCS doc with new quota info.
| | * | | | | | | | | | | | am 2b4d89b7: am eca07bfa: Merge "Doc change: Update CCS doc with new quota ↵Katie McCormick2014-04-153-55/+1677
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info." into klp-docs * commit '2b4d89b7dcea13140b64e887b2a36042e8d491e9': Doc change: Update CCS doc with new quota info.
| | | * | | | | | | | | | | am eca07bfa: Merge "Doc change: Update CCS doc with new quota info." into ↵Katie McCormick2014-04-153-55/+1677
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-docs * commit 'eca07bfaaf89d5c0280dbc44b165ee1e3ca13498': Doc change: Update CCS doc with new quota info.
| | | | * | | | | | | | | | Merge "Doc change: Update CCS doc with new quota info." into klp-docsKatie McCormick2014-04-153-55/+1677
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | Doc change: Update CCS doc with new quota info.Katie McCormick2014-04-143-55/+1677
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for: b/12665669 Change-Id: I08f812d37ab6f4347f6401b3a9682c45d96adb81
* | | | | | | | | | | | | | | Merge "Context: fixup wrong Javadoc link for BatteryManager"Todd Poynor2014-04-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Context: fixup wrong Javadoc link for BatteryManagerTodd Poynor2014-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3dec0a359185fd9bfc78d98f8232ff64e6a784dd
* | | | | | | | | | | | | | | | am e1070928: (-s ours) am 50d7bfd8: DO NOT MERGE Refactoring of ↵Adam Powell2014-04-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fitSystemWindows to applyWindowInsets for views * commit 'e1070928795210a1894a454ff88e9d529ca381a7': DO NOT MERGE Refactoring of fitSystemWindows to applyWindowInsets for views
| * | | | | | | | | | | | | | | am 50d7bfd8: DO NOT MERGE Refactoring of fitSystemWindows to ↵Adam Powell2014-04-155-20/+486
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applyWindowInsets for views * commit '50d7bfd8224f9da170dac668888bcf0831373051': DO NOT MERGE Refactoring of fitSystemWindows to applyWindowInsets for views
| | * | | | | | | | | | | | | | DO NOT MERGE Refactoring of fitSystemWindows to applyWindowInsets for viewsAdam Powell2014-04-155-20/+486
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Applying insets is now handled by: * WindowInsets class - Encapsulate system insets and local decor insets into a single object, written specifically so that new inset categories may be added later. Apps cannot construct their own WindowInsets, only clone with optional modifications. This is to prevent losing data in the event of new insets added in the future. * onApplyWindowInsets - Actually perform the application of insets. * OnApplyWindowInsetsListener - Allow an app to use a separate Listener object to apply insets to a View. This allows for things like support lib integration in custom views written for older versions where the verifier would otherwise complain about the use of the new WindowInsets class as a method parameter. It also allows for applying insets in a custom way without writing a custom view. * dispatchApplyWindowInsets - Dispatch the call to self and children in turn, if applicable. An OnApplyWindowInsetsListener will override the behavior of the view's default onApplyWindowInsets method; a listener wishing to call down to the 'superclass' implementation as part of its own operation should call view.onApplyWindowInsets. App code should generally not override this method and instead override onApplyWindowInsets or provide a listener. Compatibility support with the existing fitSystemWindows method has been provided in both directions: for code that previously called fitSystemWindows on arbitrary views and also for code that overrode the fitSystemWindows method in custom views. A view that supports the newer onApplyWindowInsets mechanism should not mix that behavior with other calls to fitSystemWindows or vice versa. Support lib-style code should take care to consistently use one mechanism or the other at runtime. Change-Id: Ie88b96e0382beb5d3c3f6cd013f7043acbc0a105