Bill Yi
a043cf04df
Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a -s ours
...
am: bbeaae705d
2017-06-23 13:00:52 +00:00
Bill Yi
995b3898c4
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 6300674d27
2017-06-23 13:00:07 +00:00
Bill Yi
16ec3c30e5
Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a -s ours
...
am: 5386943cf2
2017-06-23 12:48:51 +00:00
Bill Yi
bbeaae705d
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 6b1ff7073a
2017-06-23 12:39:42 +00:00
TreeHugger Robot
6300674d27
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-06-23 12:32:32 +00:00
Bill Yi
5386943cf2
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 6b1ff7073a
2017-06-23 12:29:05 +00:00
TreeHugger Robot
6b1ff7073a
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-06-23 12:23:16 +00:00
Bill Yi
8ec66e1f56
Import translations. DO NOT MERGE
...
Change-Id: I86e7dbea32adfb191ec6bb40cb2a4714bd583c24
Auto-generated-cl: translation import
2017-06-23 01:39:20 -07:00
Bill Yi
0695fc5d2b
Import translations. DO NOT MERGE
...
Change-Id: I277e41f97963c4f676aef802c9f0ce2c47838515
Auto-generated-cl: translation import
2017-06-23 01:33:27 -07:00
Android Build Merger (Role)
d570ab1595
Merge "Count cache in storage categories. am: b22b85b593 am: b57a71fe08" into oc-dr1-dev-plus-aosp
2017-06-23 04:30:21 +00:00
Daniel Nishi
41400d022c
Count cache in storage categories. am: b22b85b593
...
am: 5837a9b98b
2017-06-23 04:28:49 +00:00
Daniel Nishi
1b1d779ed4
Count cache in storage categories. am: b22b85b593
...
am: b57a71fe08
2017-06-23 04:28:43 +00:00
Daniel Nishi
5837a9b98b
Count cache in storage categories.
...
am: b22b85b593
2017-06-23 04:19:19 +00:00
Daniel Nishi
b57a71fe08
Count cache in storage categories.
...
am: b22b85b593
2017-06-23 04:19:16 +00:00
Daniel Nishi
b22b85b593
Count cache in storage categories.
...
This makes the System size more consistent because cache is not
attributed to the system (when the cache is under quota).
Change-Id: I680e70daf5e98b9a205023a218dfd1dcc8ee8334
Fixes: 62623731
Test: Settings Unit Test
2017-06-22 19:08:48 -07:00
Fan Zhang
9f7227eb59
Merge "Load regulatory info from /data/misc" into oc-dr1-dev
...
am: f964e8c3b2
2017-06-23 01:43:15 +00:00
TreeHugger Robot
f964e8c3b2
Merge "Load regulatory info from /data/misc" into oc-dr1-dev
2017-06-23 01:37:47 +00:00
Android Build Merger (Role)
297ab4cbf7
Merge "Bluetooth: Make notifications local-only am: 1138397336 am: 493a76e087" into oc-dr1-dev-plus-aosp
2017-06-23 00:27:29 +00:00
Marie Janssen
c514cd9483
Bluetooth: Make notifications local-only am: 1138397336
...
am: 493a76e087
2017-06-23 00:26:59 +00:00
Marie Janssen
56adef485a
Bluetooth: Make notifications local-only am: 1138397336
...
am: 0efa2b3427
2017-06-23 00:26:53 +00:00
Marie Janssen
493a76e087
Bluetooth: Make notifications local-only
...
am: 1138397336
2017-06-23 00:22:24 +00:00
Marie Janssen
0efa2b3427
Bluetooth: Make notifications local-only
...
am: 1138397336
2017-06-23 00:22:23 +00:00
Maurice Lam
a1130d5d12
Merge "Tint suggestion icons" into oc-dr1-dev
...
am: c1ab582fae
2017-06-22 21:44:22 +00:00
TreeHugger Robot
c1ab582fae
Merge "Tint suggestion icons" into oc-dr1-dev
2017-06-22 21:33:42 +00:00
Fan Zhang
1bc7ac3bfa
Load regulatory info from /data/misc
...
Bug: 62837579
Test: settings test
Change-Id: I84ef037174a1839993d02e8cd46d159398be1ddc
2017-06-22 20:13:21 +00:00
Maurice Lam
15bcab49f7
Merge "Create add more fingerprint suggestion for setup" into oc-dr1-dev
...
am: cf3130338c
2017-06-22 20:02:48 +00:00
TreeHugger Robot
cf3130338c
Merge "Create add more fingerprint suggestion for setup" into oc-dr1-dev
2017-06-22 19:58:51 +00:00
Maurice Lam
6d33cabb0f
Merge "Update CHAR LIMIT for fingerprint dialog" into oc-dr1-dev
...
am: e1eae4f05f
2017-06-22 19:58:02 +00:00
Doris Ling
dc361053a0
Merge "Update summary for Recent Apps." into oc-dr1-dev
...
am: d7fc071f48
2017-06-22 19:57:20 +00:00
Maurice Lam
e1eae4f05f
Merge "Update CHAR LIMIT for fingerprint dialog" into oc-dr1-dev
2017-06-22 19:48:12 +00:00
TreeHugger Robot
d7fc071f48
Merge "Update summary for Recent Apps." into oc-dr1-dev
2017-06-22 19:39:10 +00:00
Salvador Martinez
23888a246b
Merge "Fix BatteryInfo using enhanced estimate for charge time" into oc-dr1-dev
...
am: ed66c5fcdf
2017-06-22 18:47:11 +00:00
TreeHugger Robot
ed66c5fcdf
Merge "Fix BatteryInfo using enhanced estimate for charge time" into oc-dr1-dev
2017-06-22 18:42:16 +00:00
Maurice Lam
992fa86d52
Tint suggestion icons
...
If the suggestion is marked as isIconTintable, tint the icon with
colorControlNormal.
Test: cd tests/robotests && mma
Bug: 62258845
Change-Id: I2a76181d9b8b4d9fbf496a8fc605cb762bba87c0
2017-06-22 11:40:34 -07:00
Salvador Martinez
cb9c53dd7c
Fix BatteryInfo using enhanced estimate for charge time
...
Due to a typo in BatteryEstimates the enhanced estimate we use
for discharging would also be used for charging. This CL corrects
the typo and adds a simple test to catch a similar mistake in the
future. We were also always loading the enhanced estimate even when
we were not using it. As a ~*bonus*~ it should also help improve
the speed of the charging use case for this screen and fixes an
issue with the battery not switching to the charging icon in the
main battery page.
Test: robotest
Bug: 62738028
Bug: 62873396
Bug: 62784575
Bug: 62736144
Change-Id: Ib2cbdeea22afb7da590b701b84f526bdac243410
2017-06-22 09:42:36 -07:00
Marie Janssen
1138397336
Bluetooth: Make notifications local-only
...
This will prevent them from showing up on external devices where they
would be less than useful.
Test: connect to watch and pair a device
Bug: 34612389
Change-Id: I8b02c20200ce78a73967b8121cf7d5653b68f356
(cherry picked from commit 426903d155
2017-06-22 16:18:59 +00:00
Marie Janssen
852c930bfd
Merge "Bluetooth: Make notifications local-only" am: 348a7085fa am: 620fe71520
...
am: 3cc4522cbc
2017-06-22 15:46:01 +00:00
Marie Janssen
3cc4522cbc
Merge "Bluetooth: Make notifications local-only" am: 348a7085fa
...
am: 620fe71520
2017-06-22 15:41:55 +00:00
Marie Janssen
620fe71520
Merge "Bluetooth: Make notifications local-only"
...
am: 348a7085fa
2017-06-22 15:37:28 +00:00
Treehugger Robot
348a7085fa
Merge "Bluetooth: Make notifications local-only"
2017-06-22 15:31:39 +00:00
Juan Lang
5bc7075d48
Merge "Use SettingsLib's versions of Custom* classes." into oc-dr1-dev
...
am: d392a9bfbb
2017-06-22 14:17:37 +00:00
Juan Lang
d392a9bfbb
Merge "Use SettingsLib's versions of Custom* classes." into oc-dr1-dev
2017-06-22 14:05:56 +00:00
Maurice Lam
8ee5170c07
Update CHAR LIMIT for fingerprint dialog
...
Test: Existing tests pass
Bug: 62401478
Change-Id: I6baf88007c3f61b88603f4d5c1ee52e66e9d54dc
2017-06-21 20:17:41 -07:00
Doris Ling
11a93be4a7
Merge "Refresh the dashboard UI when swiping away the only suggestion." into oc-dr1-dev
...
am: ee947e9a31
2017-06-22 01:40:58 +00:00
TreeHugger Robot
ee947e9a31
Merge "Refresh the dashboard UI when swiping away the only suggestion." into oc-dr1-dev
2017-06-22 01:33:23 +00:00
Maurice Lam
34a181aceb
Create add more fingerprint suggestion for setup
...
Create FingerprintSuggestionActivity which is a suggestion shown in
setup to allow the user to add more fingerprints for unlocking the
device.
Test: cd tests/robotests && mma
Bug: 62638180
Change-Id: Icfab9bd2523fdeadc4cc6f0ad4f45606260c4755
2017-06-21 17:17:48 -07:00
Doris Ling
0376b0b78b
Merge "Add summary text for account sync." into oc-dr1-dev
...
am: 053e3dcf9f
2017-06-22 00:13:57 +00:00
TreeHugger Robot
053e3dcf9f
Merge "Add summary text for account sync." into oc-dr1-dev
2017-06-21 23:59:40 +00:00
Doris Ling
fa58cfca6e
Refresh the dashboard UI when swiping away the only suggestion.
...
In the new suggestion UI, the suggestions are listed inside the
suggestion container instead of individual dashboard items. When there
is only a single suggestion shown, and that is being swiped away, the
actual list for the suggestions will handle the swipe and remove that
list item from the list. However, the top level container will remain
until next time the dashboard list is being refreshed. Explicitly set
the suggestions to null to force refreshing of the dashboard UI.
Change-Id: I37f8c8f5a813a5c56f4f2f46103fdbb66ce97fcd
Fix: 62639824
Test: make RunSettingsRoboTests
2017-06-21 15:37:31 -07:00
Juan Lang
c04c3f7bd7
Use SettingsLib's versions of Custom* classes.
...
Bug: 30046624
Merged-In: I2584e820b72bb4672c53fd1a9f63c7f1662e0809
Test: make RunSettingsRoboTests
Change-Id: Icd4390c46532bedb3824511867208337c74c00a3
2017-06-21 14:47:37 -07:00
