summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Correctly name the lightRadiusztenghui2015-02-203-7/+7
| | | | | | b/18282208 Change-Id: I5b6edcb37b710464c6ff0f5c05583bb7da720ff3
* Merge "Normalize deprecated 2-letter language code when necessary."Yohei Yukawa2015-02-203-25/+28
|\
| * Normalize deprecated 2-letter language code when necessary.Yohei Yukawa2015-02-213-25/+28
| | | | | | | | | | | | | | | | | | | | | | This is a follow up CL for I7d932e60311b80c05be8f02c9e803f18da0e0054, which revealed that we could not use deprecated 2-letter code like "in" to query subtype which has new language codes like "id". This CL addresses the above issue by normalizing the language code with Locale#Locale(String, String) before comparing one to another. Change-Id: I26e3aa0333aa3c76c80a3c1c9090cc2b368c8e10
* | Merge "New intent action for returning account migration result"Alexandra Gherghina2015-02-203-3/+21
|\ \
| * | New intent action for returning account migration resultAlexandra Gherghina2015-02-203-3/+21
| | | | | | | | | | | | | | | Bug: 18551835 Change-Id: Ifc5dedf1753a7779793a8b056bac5f5733a2783d
* | | Merge "Remove activity and window stacks when last task is removed."Wale Ogunwale2015-02-203-13/+26
|\ \ \
| * | | Remove activity and window stacks when last task is removed.Wale Ogunwale2015-02-193-13/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, * Only restore recent task to a full screen stack instead of any randomly sized stack. * Fixed issue where we were restore task from recents for some operations when we didn't need to. * Null out TaskRecord.stack when the task is removed from the stack. Bug: 19083170 Change-Id: I4e006f101f9d0f2aebde130ad77afc4d258c6612
* | | | Merge "Initial attempt at jank-tracking stat collection"John Reck2015-02-2027-115/+777
|\ \ \ \ | |_|_|/ |/| | |
| * | | Initial attempt at jank-tracking stat collectionJohn Reck2015-02-2027-115/+777
| | | | | | | | | | | | | | | | | | | | | | | | Is a bit naive, perhaps overly aggressive, but sorta works Change-Id: I01a774e00dbe681439c02557d9728ae43c45ce50
* | | | Merge "Add tests for Ibb9eb9f65323795d139 and I6571d464a46453934f0"Yohei Yukawa2015-02-202-33/+492
|\ \ \ \
| * | | | Add tests for Ibb9eb9f65323795d139 and I6571d464a46453934f0Yohei Yukawa2015-02-202-33/+492
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL adds several unit tests for following CLs, both of which enabled InputMethodUtils (and dependent IMF logic) to handle 3 letter language codes and conversion from deprecated two-letter codes to new ones correctly. - Ibb9eb9f65323795d139b16d76b7e7e36a4e0568c - I6571d464a46453934f0a8f5e79018a67a9a3c845 As described in tests, the input method framework has already been able to recognize 3 letter language codes. However, there remain inconsistencies when we use deprecated 2-letter code to query subtype like "in" but the subtype has new language codes like "id". Subsequent CLs are supposed to address remaining issues. bug: 10090157 Change-Id: I7d932e60311b80c05be8f02c9e803f18da0e0054
* | | | | am 309b71e5: am 823bf307: am b5e787c1: am 26b0d973: Merge "Fix change IME ↵Adrian Roos2015-02-203-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | content description" into lmp-mr1-dev * commit '309b71e53086c9bd3b7610799836d66d64aed654': Fix change IME content description
| * \ \ \ \ am 823bf307: am b5e787c1: am 26b0d973: Merge "Fix change IME content ↵Adrian Roos2015-02-203-2/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | description" into lmp-mr1-dev * commit '823bf307a248f332f708fd8b359008df837722eb': Fix change IME content description
| | * \ \ \ \ am b5e787c1: am 26b0d973: Merge "Fix change IME content description" into ↵Adrian Roos2015-02-203-2/+4
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'b5e787c1c5a1845e0b8de53f1452a7a6cdeb4c93': Fix change IME content description
| | | * \ \ \ \ am 26b0d973: Merge "Fix change IME content description" into lmp-mr1-devAdrian Roos2015-02-203-2/+4
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '26b0d973d8c2b05e6141fb4808fbb0a28cb7f713': Fix change IME content description
| | | | * \ \ \ \ Merge "Fix change IME content description" into lmp-mr1-devAdrian Roos2015-02-203-2/+4
| | | | |\ \ \ \ \
| | | | | * | | | | Fix change IME content descriptionAdrian Roos2015-02-193-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19434845 Change-Id: I28be1d8efb61d47abdce168b07a0846056eb650d
* | | | | | | | | | Fix onDrawText for non-absolute positioningTom Hudson2015-02-201-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we were drawing text with drawTextAbsolutePos() false, we would draw the first character at 0,0 but subsequent characters would get improperly offset by y. (or x if vertical text) Change-Id: I4e76cd9d95bf1bb6ac021d99ef7cdd6333a290ba
* | | | | | | | | | Merge "Dump the profile/device owner when dumping device policy state."Nicolas Prevot2015-02-202-1/+23
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Dump the profile/device owner when dumping device policy state.Nicolas Prevot2015-02-162-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG:19363615 Change-Id: Icf04b39ce8c592544e69c52f229a2c1bdab661e2
* | | | | | | | | | | Merge "Floating Toolbars: Wrap the ActionMode creation in DecorView"Clara Bayarri2015-02-204-67/+278
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Floating Toolbars: Wrap the ActionMode creation in DecorViewClara Bayarri2015-02-194-67/+278
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change will allow us to create ActionMode representations on the fly after onCreateActionMode by using the Decorator pattern. The new ActionModeWrapper will be responsible for the creating the appropriate ActionMode depending on the type chosen by the client, and setting it up. Things pending that are NOT addressed by this CL: - ActionModes created by callback.onWindowStartingActionMode(). This includes all current usages in an existing ActionBar, as it is handled by Activity. This requires some additional refactoring. - Representing the floating type - Moving the view creation code specific to StandaloneActionMode from DecorView to ActionModeWrapper, decoupling DecorView from StandaloneActionMode completely - Supporting two ActionModes in parallel in DecorView, one of each type Change-Id: I1a8db711f53b771eac74f0e6496106acf1ca2727
* | | | | | | | | | | | Merge "Add PHONE_ACCOUNT_ADDRESS to the call log DB."Santos Cordon2015-02-201-4/+31
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add PHONE_ACCOUNT_ADDRESS to the call log DB.Santos Cordon2015-02-191-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also update some javadoc comments. Change-Id: If0f8fa0148b3aed74ed434b1017a279ce29b3842
* | | | | | | | | | | | | Merge "Small update to PhoneAccountHandle ID javadoc."Santos Cordon2015-02-201-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Small update to PhoneAccountHandle ID javadoc.Santos Cordon2015-02-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I31832347689e1e9291cd6b9c100918668fa4b056
* | | | | | | | | | | | | Merge "Add Sub-ID-from-phone-account converter method."Santos Cordon2015-02-202-1/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Add Sub-ID-from-phone-account converter method.Santos Cordon2015-02-192-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are several places in the code that currently attempt to parse the sub ID directly from the phone account which is undesireable. Before we can change from using the subID to using an ICC ID with the phone accounts, we need to create a conversion method so that no other components are parsing the sub ID out of the phone account directly. Change-Id: I74547fe0807da2fe13f3ff4422cd1d0a7a20d04c
* | | | | | | | | | | | | Merge "Add some detailed data as part of battery history."Dianne Hackborn2015-02-205-91/+537
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add some detailed data as part of battery history.Dianne Hackborn2015-02-195-91/+537
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every time the battery level changes, a new extended detailed use data structure is written to the history. This currently only contains delta CPU use since the last detailed entry (total CPU and to three uids), but it gives us the infrastructure for adding more detailed data in the future. A detail entry for regular history looks like: Details: cpu=15730u+2307s (u0a57=11312u+502s, 1000=2344u+701s, 0=473u+991s) /proc/stat=15377 usr, 1797 sys, 197 io, 0 irq, 8 sirq, 23103 idle (42.9% of 6m 44s 820ms) u is user-space cpu time, s is system/kernel time. The equivalent check-in output is: 9,h,0,Dcpu=15730:2307/10057:11312:502/1000:2344:701/0:473:991 9,h,0,Dpst=15377,1797,197,0,8,23103 Also add a new "unplug" command to the battery service, to easily put it into a state where it always considers the device to be running on battery. Change-Id: Ic76d966f11e592b9dd671879977bf999ebc11eef
* | | | | | | | | | | | | | Merge changes Ib2def344,Ifd15736bCraig Mautner2015-02-203-88/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Permit layout when stopped if reporting draw Refactor computeScreenConfigurationLocked and more.
| * | | | | | | | | | | | | | Permit layout when stopped if reporting drawCraig Mautner2015-02-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a device was woken up in a different orientation than what it went to sleep in, the window manager would force a resize to get it to predraw in the new orientation. The predraw was done in the old orientation however because layouts are skipped when the activity was stopped. This change allows layouts to proceed when the activity is stopped if the flag to report resize events is true. Fixes bug 18444400. Change-Id: Ib2def3449dd67918f6fb838bdb1fe5cc6ec57f8e
| * | | | | | | | | | | | | | Refactor computeScreenConfigurationLocked and more.Craig Mautner2015-02-192-89/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Recognizing that computeScreenConfigurationLocked() only returned false if mDisplayReady was false allows multiple code simplifications. - Make computeNewConfigurationLocked() always return a non-null value. - Remove unused Session parameter from removeWindowInnerLocked(). - Just allocate mForceRemoves one time. - Since ADJUST_WALLPAPER_VISIBILITY_CHANGED was unused have adjustWallpaperWindowsLocked() return a boolean. - Remove unused long parameter from handleNotObscuredLocked(). Change-Id: Ifd15736b163ab6e989f8ca32cf8f94b316386216
* | | | | | | | | | | | | | | Merge "Fixed issue with focused stack frame not displaying in multi-window."Wale Ogunwale2015-02-202-79/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fixed issue with focused stack frame not displaying in multi-window.Wale Ogunwale2015-02-192-79/+65
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem was caused by getting the canvas from the surface while within a transaction. Also, cleaned up code a little so it is clearer what is happening. Bug: 19249857 Change-Id: I9ff1f612bc8a58a0e0c7939dbb400d083d8a7039
* | | | | | | | | | | | | | | Merge "ImageReader: Switch to RAW16 from RAW_SENSOR"Eino-Ville Talvala2015-02-201-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | ImageReader: Switch to RAW16 from RAW_SENSOREino-Ville Talvala2015-02-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6362a997b0895686f988896de0463d834354f238
* | | | | | | | | | | | | | | | Merge "Backup/restore owner info from locksettings"Amith Yamasani2015-02-202-4/+118
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Backup/restore owner info from locksettingsAmith Yamasani2015-02-182-4/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backup the owner info string and whether or not owner info is to be shown on the lockscreen. Watch for changes to the two settings in LockSettingsService and inform backup manager. Bump up version numbers for the new entity. Bug: 19300363 Change-Id: I35485c961d18b26be68873f4d5eeedc5ae513cc8
* | | | | | | | | | | | | | | | | am 8c087c04: am 4fecab57: Merge commit ↵Bill Yi2015-02-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'32acf753e8989766f67fd5300d3eb467f707cc79\' into HEAD * commit '8c087c04471fb4b871272d572a56555e9058e42f':
| * | | | | | | | | | | | | | | | am 4fecab57: Merge commit \'32acf753e8989766f67fd5300d3eb467f707cc79\' into HEADBill Yi2015-02-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4fecab570da64a1956352aedf1b3245d3ba26030':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '32acf753e8989766f67fd5300d3eb467f707cc79' into HEADBill Yi2015-02-194004-250178/+716981
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Mark Service#onBind() @Nullable"Scott Kennedy2015-02-191-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Mark Service#onBind() @NullableScott Kennedy2015-02-191-0/+2
| | |_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6e600dd018e1cb2b51b666ec5acf56b2885c0083
* | | | | | | | | | | | | | | | | | | Merge "Changing AudioManager.listAudioDevicePorts to take a ↵Paul McLean2015-02-193-17/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ArrayList<AudioDevicePort> argument."
| * | | | | | | | | | | | | | | | | | Changing AudioManager.listAudioDevicePorts to take a ↵Paul McLean2015-02-193-17/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ArrayList<AudioDevicePort> argument. Change-Id: Ide9a2f58a7544e263600e100ba4274403201c5fa
* | | | | | | | | | | | | | | | | | | Merge "Annotate the parameter in TextUtils#isEmpty() as @Nullable"Scott Kennedy2015-02-191-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Annotate the parameter in TextUtils#isEmpty() as @NullableScott Kennedy2015-02-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaccf7f568952399d5eb48c15a5428317dd75052a
* | | | | | | | | | | | | | | | | | | Merge "Audio Device Enumeration API."Paul McLean2015-02-193-2/+302
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Audio Device Enumeration API.Paul McLean2015-02-193-2/+302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic78fda8b2a6f6ac0f37a1f665b29f3359cfc5ecc
generated by cgit v1.1 at 2025-01-25 11:58:52 +0000