summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 98ac6c79: resolved conflicts for merge of cb7cdd50 to ↵Narayan Kamath2014-01-311-1/+1
|\ | | | | | | | | | | | | klp-modular-dev-plus-aosp * commit '98ac6c79a430e62a886b3a8278694425b5906300': Fix a few more delegate methods in layoutlib.
| * resolved conflicts for merge of cb7cdd50 to klp-modular-dev-plus-aospNarayan Kamath2014-01-313-3/+3
| |\ | | | | | | | | | Change-Id: I2fc48fb4bd779042fc9bc00e6c8aca876d4a5f0b
| | * am c65e0c95: Merge "Fix a few more delegate methods in layoutlib."Narayan Kamath2014-01-303-4/+4
| | |\ | | | | | | | | | | | | | | | | * commit 'c65e0c95c855de4505a320b6dcd66df5397c88d5': Fix a few more delegate methods in layoutlib.
| | | * Merge "Fix a few more delegate methods in layoutlib."Narayan Kamath2014-01-303-4/+4
| | | |\
| | | | * Fix a few more delegate methods in layoutlib.Narayan Kamath2014-01-293-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: Icd7069452b9ac66498af69ec705d12c3acd1c848
* | | | | am 643be3ba: am 3dfa15c4: am db3278ab: Merge "Map SELinux log levels to ↵Nick Kralevich2014-01-311-1/+14
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Android log levels." * commit '643be3bab19a6305e776721854b293928bf2bfaa': Map SELinux log levels to Android log levels.
| * | | | am 3dfa15c4: am db3278ab: Merge "Map SELinux log levels to Android log levels."Nick Kralevich2014-01-311-1/+14
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '3dfa15c49b4c78cdf3bf1af79e9b307596455708': Map SELinux log levels to Android log levels.
| | * | | am db3278ab: Merge "Map SELinux log levels to Android log levels."Nick Kralevich2014-01-291-1/+14
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'db3278ab429860161e5baa26f141de95a48de0cb': Map SELinux log levels to Android log levels.
| | | * | Merge "Map SELinux log levels to Android log levels."Nick Kralevich2014-01-291-1/+14
| | | |\ \
| | | | * | Map SELinux log levels to Android log levels.Stephen Smalley2014-01-291-1/+14
| | | |/ / | | | | | | | | | | | | | | | | | | | | Change-Id: I202c543ca6e4110c4011d1904eada4b75b59ff10 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | | Merge "Change ResourceType cookies to int32_t."Narayan Kamath2014-01-315-26/+25
|\ \ \ \ \
| * | | | | Change ResourceType cookies to int32_t.Narayan Kamath2014-01-285-26/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also change the order of parameters in ResTable constructors to avoid ambiguity. Change-Id: If7bfa1f640dddca39b9f26a3ce84081fa7b6e6e3
* | | | | | am 53959634: am 40a7e3c4: am e71cc6fd: am 897739f1: Merge "Revert "add Cast ↵Scott Main2014-01-311-5/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | to the sidenav"" into klp-docs * commit '53959634b35ab75ef40ac4514d50bae2de9425ac': Revert "add Cast to the sidenav"
| * | | | | am 40a7e3c4: am e71cc6fd: am 897739f1: Merge "Revert "add Cast to the ↵Scott Main2014-01-301-5/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sidenav"" into klp-docs * commit '40a7e3c425120661c305999f7c2bdd76d3240b7d': Revert "add Cast to the sidenav"
| | * \ \ \ \ am e71cc6fd: am 897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docsScott Main2014-01-301-5/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e71cc6fd82df1bf654d72e796ac7975dbf0aff29': Revert "add Cast to the sidenav"
| | | * \ \ \ \ am 897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docsScott Main2014-01-301-5/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '897739f1b7d179cd402fcf907e2ac9751fe44c6d': Revert "add Cast to the sidenav"
| | | | * \ \ \ \ Merge "Revert "add Cast to the sidenav"" into klp-docsScott Main2014-01-301-5/+0
| | | | |\ \ \ \ \
| | | | | * | | | | Revert "add Cast to the sidenav"Scott Main2014-01-301-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3781318fefba28699e7713b231c9591bf29eadac. Change-Id: Iacefcd9a9d1f678d7a16f2bcdaac4c6cc90a475d
* | | | | | | | | | am a749593d: am 04022e50: am 4b1a317a: am 428ccea5: Merge "Revert "add ↵Scott Main2014-01-312-99/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | google cast feature page"" into klp-docs * commit 'a749593dd64f6d8f8d5d5e6addd16699258e9130': Revert "add google cast feature page"
| * | | | | | | | | am 04022e50: am 4b1a317a: am 428ccea5: Merge "Revert "add google cast ↵Scott Main2014-01-302-99/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature page"" into klp-docs * commit '04022e50774c02ff0a7757c5464486af021fd108': Revert "add google cast feature page"
| | * | | | | | | | am 4b1a317a: am 428ccea5: Merge "Revert "add google cast feature page"" into ↵Scott Main2014-01-302-99/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-docs * commit '4b1a317abb56dc90efacf86ccd796643b1f02478': Revert "add google cast feature page"
| | | * | | | | | | am 428ccea5: Merge "Revert "add google cast feature page"" into klp-docsScott Main2014-01-302-99/+0
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '428ccea5090d3a88d6af898cd90b52df4062101f': Revert "add google cast feature page"
| | | | * | | | | | Merge "Revert "add google cast feature page"" into klp-docsScott Main2014-01-302-99/+0
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Revert "add google cast feature page"Scott Main2014-01-302-99/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit cf010ab9c5df8896c57a722137ac3b4306ef1ca5. Change-Id: I87197ce3c4f65ae8899bbf081cb4c0e84e4f1684
* | | | | | | | | | | am 7ce575a5: am bcf8faa6: am f29e2589: am 583e0b2c: Merge "Revert "docs: ↵Quddus Chong2014-01-31402-111261/+8325
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added API reference docs for GCore Iberico release."" into klp-docs * commit '7ce575a5257328ce089d6eaa39eb493eafbd473c': Revert "docs: Added API reference docs for GCore Iberico release."
| * | | | | | | | | | am bcf8faa6: am f29e2589: am 583e0b2c: Merge "Revert "docs: Added API ↵Quddus Chong2014-01-30402-111261/+8325
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reference docs for GCore Iberico release."" into klp-docs * commit 'bcf8faa6c79bde5b9580057238e447165ac9d329': Revert "docs: Added API reference docs for GCore Iberico release."
| | * | | | | | | | | am f29e2589: am 583e0b2c: Merge "Revert "docs: Added API reference docs for ↵Quddus Chong2014-01-30402-111261/+8325
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GCore Iberico release."" into klp-docs * commit 'f29e2589a440e73d9dea1a6c9c7aed1c5a3002f2': Revert "docs: Added API reference docs for GCore Iberico release."
| | | * | | | | | | | am 583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico ↵Quddus Chong2014-01-30402-111261/+8325
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release."" into klp-docs * commit '583e0b2c0e1011406342a0801045a893b75880ca': Revert "docs: Added API reference docs for GCore Iberico release."
| | | | * | | | | | | Merge "Revert "docs: Added API reference docs for GCore Iberico release."" ↵Quddus Chong2014-01-30402-111261/+8325
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-docs
| | | | | * | | | | | | Revert "docs: Added API reference docs for GCore Iberico release."Quddus Chong2014-01-30402-111261/+8325
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 32993c68fff5cb229c8503ffe0fad06b53189377. Change-Id: I8eab48ae260a3289ae0d4c0a131d80a1fd1a5316
* | | | | | | | | | | | am 3cab7fc1: Merge "Add proxy as another network." into klp-modular-devHui Lu2014-01-313-2/+136
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3cab7fc1b8f06166df3a58cf10d4a0db36bde788': Add proxy as another network.
| * | | | | | | | | | | Merge "Add proxy as another network." into klp-modular-devHui Lu2014-01-303-2/+136
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Add proxy as another network.Hui Lu2014-01-303-2/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I70cb6ac5604c4f0d6a752a291c40de2445ae98bb
* | | | | | | | | | | | | Merge "Add PathInterpolator to interpolate along a Path."George Mount2014-01-315-3/+231
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add PathInterpolator to interpolate along a Path.George Mount2014-01-305-3/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I45b361ef8edd49b5e22d66ba9e25600065e0d5e7
* | | | | | | | | | | | | | Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default"Brian Carlstrom2014-01-312-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new defaultBrian Carlstrom2014-01-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit c6c633608ad4cd77ed21227b0bdb11eb79797c31) Bug: 12798969 Change-Id: Ibb7ed86867e4dca53ad7fe33326b08e6f5e664c4
* | | | | | | | | | | | | | | Merge "Fix nano vs. millis"John Reck2014-01-302-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix nano vs. millisJohn Reck2014-01-292-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I54f752bb7faab5fa66c36252c9f7cf8f5c9939c9
* | | | | | | | | | | | | | | | Merge "Make public but hide OnPreferenceTreeClickListener"Fabrice Di Meglio2014-01-301-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Make public but hide OnPreferenceTreeClickListenerFabrice Di Meglio2014-01-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - needed as the Settings app is no more a PreferenceActivity Change-Id: I583493c4027b983efd059564a12eff0814c6bf02
* | | | | | | | | | | | | | | | | Merge "Fix bug #12066726 java.lang.NullPointerException at ↵Fabrice Di Meglio2014-01-301-25/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android.widget.CalendarView.onScroll(CalendarView.java:1216)"
| * | | | | | | | | | | | | | | | | Fix bug #12066726 java.lang.NullPointerException at ↵Fabrice Di Meglio2014-01-281-25/+27
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android.widget.CalendarView.onScroll(CalendarView.java:1216) - fix the NPE by checking the validity of the child reference retrieved by View.getChildAt(...) Change-Id: I6821448a5831c83c0931eb7bb0ef4c3f1a47247f
* | | | | | | | | | | | | | | | | Merge "Formatting fix"Patrick Tjin2014-01-301-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Formatting fixPatrick Tjin2014-01-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove whitespace from end of Sync Status table Change-Id: I5b0bf3380e0c67c769ec9c334f1374713c94aa94
* | | | | | | | | | | | | | | | | | Merge "Allow "opaque" flag to be updated"Andy McFadden2014-01-301-10/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Allow "opaque" flag to be updatedAndy McFadden2014-01-291-10/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a setOpaque() call and a bunch of comments. Bug 12387406 Change-Id: Ic066cba926223f22f9bc56a7013987001d9cc795
* | | | | | | | | | | | | | | | | | Merge "Redact public version of screenshot notifications."Dan Sandler2014-01-301-3/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Redact public version of screenshot notifications.Dan Sandler2014-01-301-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's OK to reveal that a screenshot has been taken, but the public version of this notification no longer shows the actual screenshot image itself (in case it was taken before the device was locked and therefore might contain sensitive information). Change-Id: I5ba0b64023810ece0cea56ba457968fbde4b0cbe
* | | | | | | | | | | | | | | | | | | Merge "SystemUI support for notification visibility."Dan Sandler2014-01-308-35/+194
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
generated by cgit v1.1 at 2025-01-25 16:11:35 +0000