Commit Graph

43377 Commits

Author SHA1 Message Date
ryanywlin
ef680f82db Merge "Add "take call on" string for audio output switcher." into pi-dev
am: cd908497d6

Change-Id: I7d05037db8d57e9dc891f195d06da18ae529d5c2
2018-03-20 06:06:35 +00:00
Andreas Terzis
b32915a9a7 Merge "In Data Usage screen, hide data bar if plan is unlimited" into pi-dev
am: 91ea3c5e56

Change-Id: I17360c93f650a7f9705295961ce4459d9acb32dd
2018-03-20 06:05:54 +00:00
TreeHugger Robot
cd908497d6 Merge "Add "take call on" string for audio output switcher." into pi-dev 2018-03-20 05:52:06 +00:00
Andreas Terzis
91ea3c5e56 Merge "In Data Usage screen, hide data bar if plan is unlimited" into pi-dev 2018-03-20 05:49:51 +00:00
Lei Yu
fca54d8788 Merge "Add summary for battery manager preference" into pi-dev
am: 06d5188a71

Change-Id: I69d1a30f9d6ae1682b806c80a976ddad1f37c3c2
2018-03-20 05:23:20 +00:00
Lei Yu
b5d38cc5f9 Merge "Update string for battery seekbar" into pi-dev
am: 8916df573d

Change-Id: I35400bdfe84594be938373a28fd9c660a34cce3f
2018-03-20 05:22:36 +00:00
Sunny Goyal
472037fdd3 Merge "Fixing settings crash when no default home app is set" into pi-dev
am: ee2ac81999

Change-Id: Ie74613b09179d9c518139cfc597ad62479d9d7c5
2018-03-20 05:22:09 +00:00
hughchen
5cf0b2843e Merge "Change BatteryUtils.isLegacyApp() to isPreOApp()" into pi-dev
am: 138bdf6030

Change-Id: I80fba5f82a2b75a88660478cc91077db648f8204
2018-03-20 05:21:34 +00:00
timhypeng
4ae326b54d Merge "Add new string for audio switch" into pi-dev
am: 73f1a3180a

Change-Id: Ib10a001446f04bbbd0e5a7a127a777a8d1a43184
2018-03-20 05:20:51 +00:00
Maurice Lam
f7c9fbea5e Merge "Make "minimal" pattern layout sw320dp" into pi-dev
am: b98eea4c67

Change-Id: I54ae0434ed07e0bb2842317d91cc6c8b5af8406b
2018-03-20 05:20:05 +00:00
Fan Zhang
e147c48470 Merge "Update switch bar summary for spell checker page" into pi-dev
am: 39b54ea1f8

Change-Id: I66bcfd8f0bf5ddcebeca14cb5c1103278ff3a97f
2018-03-20 05:19:17 +00:00
HJ ChangLiao
cbd6c33774 Merge "Remove ops preference from specific app" into pi-dev
am: ac20e2d511

Change-Id: I0eb1403ecaaed7d2cfa932a0228e707653623a16
2018-03-20 05:17:57 +00:00
jdesprez
42e58da882 Merge "Update AndroidTest.xml to be APCT suite ready" into pi-dev
am: a2da6221c0

Change-Id: I59ed1b0b9bc8ee262f9bc1602ab03773e9f71026
2018-03-20 04:54:41 +00:00
TreeHugger Robot
06d5188a71 Merge "Add summary for battery manager preference" into pi-dev 2018-03-20 04:36:48 +00:00
TreeHugger Robot
8916df573d Merge "Update string for battery seekbar" into pi-dev 2018-03-20 04:32:51 +00:00
TreeHugger Robot
ee2ac81999 Merge "Fixing settings crash when no default home app is set" into pi-dev 2018-03-20 04:32:10 +00:00
TreeHugger Robot
138bdf6030 Merge "Change BatteryUtils.isLegacyApp() to isPreOApp()" into pi-dev 2018-03-20 04:09:27 +00:00
TreeHugger Robot
73f1a3180a Merge "Add new string for audio switch" into pi-dev 2018-03-20 04:08:27 +00:00
TreeHugger Robot
b98eea4c67 Merge "Make "minimal" pattern layout sw320dp" into pi-dev 2018-03-20 03:30:42 +00:00
ryanywlin
8f3f3c5a4e Add "take call on" string for audio output switcher.
Bug: 74130772
Test: rebuild

Change-Id: I652015e0e051a37e8df2d8f7d04b2acbcc2bdaf6
2018-03-20 11:03:22 +08:00
TreeHugger Robot
39b54ea1f8 Merge "Update switch bar summary for spell checker page" into pi-dev 2018-03-20 02:58:38 +00:00
Lei Yu
549d4bd297 Merge "update "Last full charge" preference" into pi-dev
am: de0a3a5334

Change-Id: I8b7ef49bc738f88cf36d31208e5370a292eb23b5
2018-03-20 02:57:55 +00:00
TreeHugger Robot
ac20e2d511 Merge "Remove ops preference from specific app" into pi-dev 2018-03-20 02:35:21 +00:00
xshu
ba2acc4ba0 Updating special Settings Wi-Fi strings
am: e0a6d1640a

Change-Id: Ic9c587ed88b22d16f8f6ca1dca61bdcccf4214ff
2018-03-20 02:35:02 +00:00
Lei Yu
6c16840ff5 Add summary for battery manager preference
Show different summary based on whether it is on and there is restricted
apps.

Also move method to get restricted app list to BatteryTipUtils since it
is used in 2 places.

Bug: 73018395
Test: RunSettingsRoboTests
Change-Id: Ib2306e0fd1f520fde6d1403ce9c527c241d36005
2018-03-19 19:27:36 -07:00
Lei Yu
b3113bf861 Update string for battery seekbar
Bug: 73018395
Test: RunSettingsRoboTests
Change-Id: I7661fb8d324ae5df468e03d2940a48e03952e3cb
2018-03-19 19:23:29 -07:00
TreeHugger Robot
a2da6221c0 Merge "Update AndroidTest.xml to be APCT suite ready" into pi-dev 2018-03-20 02:13:47 +00:00
Sunny Goyal
617acf352b Fixing settings crash when no default home app is set
Test: make -j20 RunSettingsRoboTests
Bug: 74519090
Change-Id: I8846bae1f0083be981cfde9a68291c1b01359228
2018-03-20 02:08:14 +00:00
hughchen
18ce28ed33 Change BatteryUtils.isLegacyApp() to isPreOApp()
Bug: 73792442
Test: RunSettingsRoboTests
      make -j40 RunSettingsRoboTests
Change-Id: I770030a8f38ec6156aa2a40f4c88ac9e0673751d
2018-03-20 01:44:43 +00:00
Fan Zhang
1a77cfc8fe Update switch bar summary for spell checker page
Change-Id: If48ad81e5ad5e4a7bd65ede5ed67d28250fbe8ed
Fixes: 75277295
Test: atest SpellCheckerSettingsUITest
2018-03-19 18:05:10 -07:00
Lei Yu
de0a3a5334 Merge "update "Last full charge" preference" into pi-dev 2018-03-20 00:33:29 +00:00
Hall Liu
0738a917df Merge "Split "Mobile Network Type" indication in Settings" into pi-dev
am: 8837f992bb

Change-Id: I41aec9f11b1e34cd56681b171a587bddb539f54e
2018-03-20 00:16:45 +00:00
xshu
e0a6d1640a Updating special Settings Wi-Fi strings
Bug: 74356729
Test: compile

Manually inspected the affected UI pages

Change-Id: I6905dce8f3d6c4acbddedccbf0401b9ef6bba53b
2018-03-19 17:09:16 -07:00
Lei Yu
f31a7c546d Merge "Update the mechanism to upload new anomaly config" into pi-dev
am: d06991821f

Change-Id: Icdeb6c116a320fdfc661c2ce27b01a6f8f806f17
2018-03-19 23:47:10 +00:00
Phil Weaver
5f6dd9b4f2 Merge "Update string for dwell click timing" into pi-dev
am: c10659cee7

Change-Id: I242b3787680ffa75dfc6294ae4c6d893025d37fc
2018-03-19 23:37:03 +00:00
jdesprez
881004ca26 Update AndroidTest.xml to be APCT suite ready
Test: atest SettingsUITests
Bug: 74440293
Change-Id: Id7940589a5cd216668ab4664bb802faaf70b5f68
2018-03-19 14:46:45 -07:00
Hall Liu
8837f992bb Merge "Split "Mobile Network Type" indication in Settings" into pi-dev 2018-03-19 21:15:26 +00:00
Jan Nordqvist
641288f7c1 In Data Usage screen, hide data bar if plan is unlimited
Bug: 70950124

Test: manual
Test: make RunSettingsRoboTests
Change-Id: I1314bdf9748c55a2391ccb39ff66c3dcb133be7e
2018-03-19 14:13:47 -07:00
Lei Yu
d06991821f Merge "Update the mechanism to upload new anomaly config" into pi-dev 2018-03-19 20:20:15 +00:00
Lei Yu
8b148924de update "Last full charge" preference
When there is average time estimation, change it to "Full charge lasts
about" and also update the time.

Also update the BatteryInfo to return average time estimation even
though it is charging.

Bug: 73018395
Test: RunSettingsRoboTests
Change-Id: Ib22dadb5716e3034c60aeeb7768fdbf0cc86be0c
2018-03-19 13:18:27 -07:00
Phil Weaver
c10659cee7 Merge "Update string for dwell click timing" into pi-dev 2018-03-19 19:58:02 +00:00
Lei Yu
7f14fa4f7d Merge "Remove dupe key in UniquePreferenceTest" into pi-dev
am: dcf7b68920

Change-Id: I0bdf645ed8a067dff853b063ff99b1013d85830b
2018-03-19 19:34:51 +00:00
Jong Wook Kim
3520bfc36d Merge "Display "MAC address is randomized" in Wifi Preference Page" into pi-dev
am: 8a022d8693

Change-Id: Id2c0523182ccbfb629f9a296bb8b6117651f2b4e
2018-03-19 19:15:17 +00:00
Jan Nordqvist
085b9e6f83 Merge "In Data Usage screen, Above the data bar, Change font size of number." into pi-dev
am: 9e1226e431

Change-Id: I5fd67fc34ed244178b6c6a9919761ceaa6087239
2018-03-19 19:06:11 +00:00
Lei Yu
dcf7b68920 Merge "Remove dupe key in UniquePreferenceTest" into pi-dev 2018-03-19 18:45:08 +00:00
Maurice Lam
b0e88dbbfe Make "minimal" pattern layout sw320dp
The minimal layout was sw400dp, but some smaller phones still have
enough space to display the icon and button decently, so we're
reducing the trigger threshold for the "minimal" layout to sw320dp.

Test: m -j RunSettingsRoboTests
Bug: 74527018
Change-Id: Ibfca1828870058301cca302554ce3d932c8ba70b
2018-03-19 18:27:18 +00:00
Jong Wook Kim
8a022d8693 Merge "Display "MAC address is randomized" in Wifi Preference Page" into pi-dev 2018-03-19 18:14:08 +00:00
Jan Nordqvist
9e1226e431 Merge "In Data Usage screen, Above the data bar, Change font size of number." into pi-dev 2018-03-19 18:05:44 +00:00
Bill Yi
175a8c8626 Merge "Import translations. DO NOT MERGE" into pi-dev
am: 8aff2f8fe7  -s ours

Change-Id: I63ed30b348c6c5858a2b4153f6d24ebeb2e5e047
2018-03-19 17:47:02 +00:00
TreeHugger Robot
8aff2f8fe7 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-03-19 17:07:14 +00:00