Commit Graph

6379 Commits

Author SHA1 Message Date
Dan Sandler
3fae8ae0c6 One final tweak to the platlogo.
am: 4b7e415803

Change-Id: Ieef461bb4c1b59fd22e5f830b2b25311422cedae
2016-06-28 07:07:31 +00:00
Dan Sandler
4b7e415803 One final tweak to the platlogo.
Bug: 27376882
Change-Id: Ie60600018204f48593975b947d6fc10f4dd8a69f
2016-06-27 22:59:24 -04:00
Dan Sandler
fadfc8e5e5 Cats are not, technically, tasty treats.
am: 27a9fcc618

Change-Id: I04dd4cf9573e88635e814d75162b742fe19b316d
2016-06-26 22:56:01 +00:00
Dan Sandler
27a9fcc618 Cats are not, technically, tasty treats.
Bug: 27376882
Change-Id: I97183339e51c5d07fe6e9404bbcc5178ca605c05
Copilot: Jason Monk <jmonk@google.com>
2016-06-26 15:00:11 +00:00
John Reck
c86a2e325e Merge \"Remove FD from the right Looper\" into nyc-dev
am: db13dd41a9

Change-Id: I451ef3649426d9b8ea1bf15e388d0efa82dae442
2016-06-23 18:39:44 +00:00
John Reck
ac04f4e69a Remove FD from the right Looper
Bug: 29586513

Also gives BackdropFrameRenderer a direct-destroy
of Choreographer since it's hammering on new Threads
and we don't want to wait for the GC to release
FDs.

Change-Id: Id2ec0af2ee4d5304961c4ab87a104ccb92f35fc2
2016-06-23 11:00:00 -07:00
Adam Lesinski
31ef27c249 Merge \"Prevent early boot crash reading PowerProfile\" into nyc-dev
am: ec6db57ac7

Change-Id: I6366fcaa2b1a85b271d74df321100d590fd258a1
2016-06-22 17:37:41 +00:00
Adam Lesinski
ec6db57ac7 Merge "Prevent early boot crash reading PowerProfile" into nyc-dev 2016-06-22 17:31:35 +00:00
Adam Lesinski
1a76a62b8d Prevent early boot crash reading PowerProfile
The PowerProfile in BatteryStatsImpl may not be ready when
resetting stats early in the boot sequence.

Bug:29559031
Change-Id: I51bba762231a08804f1b68505bb1b0523476081d
2016-06-22 10:28:47 -07:00
Roozbeh Pournader
1f2f328025 Merge \"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\" into nyc-dev
am: 160126e2d8

Change-Id: I0897fc904264955dddf459c893bd774fb1ff74e1
2016-06-20 21:44:50 +00:00
Roozbeh Pournader
160126e2d8 Merge "Mark Serbian in Latin script as non-localized [DO NOT MERGE]" into nyc-dev 2016-06-20 21:39:22 +00:00
Adam Lesinski
145e50243e Merge \"BatteryStats: record best estimated battery capacity\" into nyc-dev
am: c2e06a55f9

Change-Id: Ifb3d993b085040c17f136dd0f91433762d3d548f
2016-06-20 19:55:37 +00:00
TreeHugger Robot
c2e06a55f9 Merge "BatteryStats: record best estimated battery capacity" into nyc-dev 2016-06-20 19:49:46 +00:00
Adam Lesinski
f9b20a9ec4 BatteryStats: record best estimated battery capacity
Using the coulomb counter, record the estimated max battery
capacity.

Bug:28743761
Change-Id: I1270b062cf4a1e6fd69ea1da3de11a85a81b3663
2016-06-20 10:58:37 -07:00
Roozbeh Pournader
e977b0ae59 Mark Serbian in Latin script as non-localized [DO NOT MERGE]
Serbian in Latin script is only partially localized in Android N. We
should not show it as localized in either Setup Wizard or Settings.

Bug: 29460424
Change-Id: I6829a89c49c1b5e8768b1527daa3aa9508deb491
2016-06-17 17:34:13 -07:00
Selim Cinek
0630d92064 Merge \"Added dismiss, expand, and collapse accessibility actions\" into nyc-dev
am: c1720dce1b

Change-Id: I25bd41f1307233bba14067952086ca7be3118505
2016-06-16 04:25:26 +00:00
TreeHugger Robot
c1720dce1b Merge "Added dismiss, expand, and collapse accessibility actions" into nyc-dev 2016-06-16 04:19:48 +00:00
Mihai Nita
d80a8e8fe7 Merge \"Fix for NullPointerException in SuggestedLocaleAdapter\" into nyc-dev
am: c8c9afeacb

Change-Id: Ib9d44296bbb851940a0da0a9a6234f2023dfef25
2016-06-16 00:37:54 +00:00
Mihai Niță
c8c9afeacb Merge "Fix for NullPointerException in SuggestedLocaleAdapter" into nyc-dev 2016-06-16 00:28:37 +00:00
Mihai Nita
1711d430cb Fix for NullPointerException in SuggestedLocaleAdapter
Bug: 28748150
Change-Id: Ide2d176d3bc0bb7529bf831b553db3ade37ddb69
2016-06-15 17:07:10 -07:00
Selim Cinek
e9bad242f3 Added dismiss, expand, and collapse accessibility actions
Fixes: 20343017
Fixes: 29368014
Change-Id: Ib571242aac04c67aea2f3c3ce76139eaedc1f3f1
2016-06-15 16:30:09 -07:00
Yohei Yukawa
bb587122c6 Merge \"Quick workaround for a performance regression in IME APIs.\" into nyc-dev
am: 6fe4865e85

Change-Id: Id039d1dd681483c1d86349ee7e765b2f1f4fa95f
2016-06-14 22:47:28 +00:00
Yohei Yukawa
6fe4865e85 Merge "Quick workaround for a performance regression in IME APIs." into nyc-dev 2016-06-14 22:43:19 +00:00
Yohei Yukawa
ccb024aa2b Quick workaround for a performance regression in IME APIs.
It turns out that the performance of
InputMethodManager#getCurrentInputMethodSubtype() is regressed from ~1ms
to ~20ms when
 - Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE == -1 and
 - The active IME supports many subtypes (~100)
because we try to find a fallback subtype based on the system locales
every time when IMM#getCurrentInputMethodSubtype() is called.

This could be contributing UI janks because spell checker clients
running in the UI thread indirectly depend on that method.

Fortunatelly the critical path is in
InputMethodUtils#getImplicitlyApplicableSubtypesLockedImpl(), which is
basically a state-less method. We can easily and safely cache its
result by using LocaleList and InputMethod as cache keys.

With this CL the performance basically recovers to the Android M level.

Bug: 28889203
Change-Id: I5ed16c7f14cc18052854f4fd6c9bae8550c332ee
2016-06-14 21:01:41 +00:00
Adrian Roos
0a91c8dddf Merge \"Add MessagingStyle transitions\" into nyc-dev
am: a5e2aa99c0

Change-Id: I96170c3811dd624969a1f93bb7a2dc65b8d5df0a
2016-06-13 22:20:05 +00:00
Adrian Roos
a5e2aa99c0 Merge "Add MessagingStyle transitions" into nyc-dev 2016-06-13 21:45:08 +00:00
Adrian Roos
feafa052f3 Add MessagingStyle transitions
Fixes a particularly bad transition in the case where there
is one incoming message to a group.

Change-Id: Ieddece4a496292a69e14cdcd74d94986938d8223
Fixes: 29043489
2016-06-13 14:31:51 -07:00
Andrii Kulian
6e6b0ce1a6 Merge \"Reinflate primary action mode view after detach\" into nyc-dev
am: 82f2df6108

Change-Id: I80f1aa56145ea12001942c57161305b3fcdcc226
2016-06-11 01:38:37 +00:00
TreeHugger Robot
82f2df6108 Merge "Reinflate primary action mode view after detach" into nyc-dev 2016-06-11 01:31:15 +00:00
Andrii Kulian
8d6ac26504 Reinflate primary action mode view after detach
When app is resized in multi-window mode we preserve the window along
with the decor view. If action mode view was shown before such config
change, its view is detached, but the mPrimaryActionModeView variable
is not cleared. So when action mode view is shown again after that it
thinks that its view is still alive.
This CL adds additional check to inflate new mPrimaryActionModeView
if it is not attached to any window.

Bug: 28971666
Change-Id: Ia8c24d4322be32e8b2c8967301beb3a4d889d501
2016-06-10 16:07:43 -07:00
Adam Lesinski
643fc8341a Merge \"BatteryStats: Fix read/write parcel order\" into nyc-dev
am: e8a442ccd6

Change-Id: Ic0a5b9acedd9ed56aaa189aaf89aaa10f273f019
2016-06-10 22:43:49 +00:00
Adam Lesinski
e8a442ccd6 Merge "BatteryStats: Fix read/write parcel order" into nyc-dev 2016-06-10 22:29:15 +00:00
Adam Lesinski
67c134f849 BatteryStats: Fix read/write parcel order
Also moves discharge coulomb data to BATTERY_DISCHARGE_DATA checkin line.

Bug:29264326
Bug:28743761
Change-Id: I78881e166c11f40b2397e04d2cab8d5200c71eea
2016-06-10 15:24:16 -07:00
Adam Lesinski
ae903e100f Merge \"BatteryStats: Record fine grained battery discharge\" into nyc-dev
am: 094c40b2cc

Change-Id: Ia25345a4ae48ad181edb58fd4b5940145ce19107
2016-06-10 02:21:50 +00:00
TreeHugger Robot
094c40b2cc Merge "BatteryStats: Record fine grained battery discharge" into nyc-dev 2016-06-10 02:12:23 +00:00
Adam Lesinski
3ee3f63eb8 BatteryStats: Record fine grained battery discharge
For devices that report battery discharge via a coulomb counter,
record how much of the battery was discharged while the screen
was on/off.

Bug:28743761
Change-Id: Ie2d1708864352029ff466c1fed14fc057e19b93b
2016-06-09 17:37:22 -07:00
Phil Weaver
e2b3248823 Merge \"Improve accessibility window title behavior\" into nyc-dev
am: f8af34365c

Change-Id: Id9d2de6b82f8e8062c0d66d759440b574b113a02
2016-06-09 23:42:47 +00:00
Phil Weaver
155edc693e Improve accessibility window title behavior
Un-reverts ag/1057448, but uses a version of Resources#getText
that returns null rather than throw an exception when no title
is available. This is the same call made before, so this change
should be safer.

Bug: 28744278
Change-Id: I8c123f4f6d74f796ab9e8ffcf955aaf881770da1
2016-06-09 13:45:46 -07:00
Adam Lesinski
4ae9097f69 Merge \"Consume the first sample of KernelUidCpuTimeReader\" into nyc-dev
am: e5417a3863

Change-Id: I67f604fbacba0efb95ff01b2de5bd7799eb8c3d9
2016-06-08 22:55:33 +00:00
Adam Lesinski
e7f4f0297f Consume the first sample of KernelUidCpuTimeReader
If the system_server crashes, when it starts back up
it will assume that the entries in kernelUidCpuTimeReader
are all fresh and we will end up double counting cpu time
and power.

Bug:29163081
Change-Id: I73e693199c170229af57efd610950e90263ac9bc
2016-06-08 14:19:09 -07:00
Phil Weaver
2c8099110e Merge \"Revert \"Improve accessibility window title behavior\"\" into nyc-dev
am: fc71309640

Change-Id: Ia2728037f9e610dd49db2bd1a22fd72690bd5340
2016-06-08 02:24:47 +00:00
Phil Weaver
fc71309640 Merge "Revert "Improve accessibility window title behavior"" into nyc-dev 2016-06-08 02:19:34 +00:00
Andreas Gampe
66c2bfcede Merge \"Frameworks/base: Fix FastPrintWriter infinite loop\" into nyc-dev
am: c82a2b5358

Change-Id: I3da283b088e2e0d689ac35d634823497fa2fece1
2016-06-08 00:45:35 +00:00
TreeHugger Robot
c82a2b5358 Merge "Frameworks/base: Fix FastPrintWriter infinite loop" into nyc-dev 2016-06-08 00:39:00 +00:00
Jim Miller
2cf5b73c0a Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
am: 4401e24add

Change-Id: Ic10c6505e4583f487a41eb659227b955013949b7
2016-06-08 00:38:31 +00:00
Phil Weaver
266ed9acc3 Revert "Improve accessibility window title behavior"
Bug: 29127065

This reverts commit 2a7e4442bf.

Change-Id: Ibc5527cfedd49c685ffd1b8ae59e87ed99c93d39
2016-06-08 00:34:40 +00:00
TreeHugger Robot
4401e24add Merge "Move legacy full disk encryption code to Settings." into nyc-dev 2016-06-08 00:31:31 +00:00
Andreas Gampe
ce78b9e114 Frameworks/base: Fix FastPrintWriter infinite loop
Check for error condition in loop.

Bug: 29123428
Change-Id: I361ed27ecb8f05512d7e17f8045f3d34667d32d8
2016-06-07 16:02:23 -07:00
Jim Miller
525ca53b4f Move legacy full disk encryption code to Settings.
Fixes bug 27617297

Change-Id: I59455cc1fc46949348d2922834724ab40c14f886
2016-06-03 18:39:16 -07:00
Dianne Hackborn
c9aaec43a6 Merge "Work on issue #29042642: Watchdog going off" into nyc-dev
am: 5a6cf3ac9a

* commit '5a6cf3ac9a3945c2d1f0e5e28ffda9e52124eb15':
  Work on issue #29042642: Watchdog going off

Change-Id: Ic0c08c2ab1c0e7b1cc195928492ab4c0eaef782f
2016-06-02 18:49:29 +00:00