Commit Graph

43545 Commits

Author SHA1 Message Date
Lei Yu
f687bc9b99 Merge "Update string for battery seekbar" into pi-dev am: 8916df573d
am: b5d38cc5f9

Change-Id: I4d631531c96e1afca80edca0779a02a5aa3e20fe
2018-03-20 08:32:40 +00:00
Sunny Goyal
e89345ac20 Merge "Fixing settings crash when no default home app is set" into pi-dev am: ee2ac81999
am: 472037fdd3

Change-Id: I529c019f5109297f5ec3064128367d3c66ac931e
2018-03-20 08:31:14 +00:00
hughchen
7fc5f884db Merge "Change BatteryUtils.isLegacyApp() to isPreOApp()" into pi-dev am: 138bdf6030
am: 5cf0b2843e

Change-Id: I7529e6fdc451816ab29ede90f433086081a61b24
2018-03-20 08:28:14 +00:00
timhypeng
8227e7cf31 Merge "Add new string for audio switch" into pi-dev am: 73f1a3180a
am: 4ae326b54d

Change-Id: I921b3798ff3fda4b08e31b690861d7079c4536f2
2018-03-20 08:08:54 +00:00
Maurice Lam
52512f64ee Merge "Make "minimal" pattern layout sw320dp" into pi-dev am: b98eea4c67
am: f7c9fbea5e

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

Change-Id: I0c7473f61ac3a783f8a1559fc88396e73c3f35e9
2018-03-20 08:06:26 +00:00
HJ ChangLiao
e1c2c8d9b3 Merge "Remove ops preference from specific app" into pi-dev am: ac20e2d511
am: cbd6c33774

Change-Id: I1eac43a72e96820091f320711c4dd0c162612832
2018-03-20 08:04:11 +00:00
jdesprez
57b9e15574 Merge "Update AndroidTest.xml to be APCT suite ready" into pi-dev am: a2da6221c0
am: 42e58da882

Change-Id: I7e6eafdc273f656120739c301564554759abf301
2018-03-20 07:55:16 +00:00
Lei Yu
ccba53cb0b Merge "update "Last full charge" preference" into pi-dev am: de0a3a5334
am: 549d4bd297

Change-Id: Ie2a55082d3a7916b5eec4499518f2675c92afce2
2018-03-20 07:44:49 +00:00
xshu
da432d904a Updating special Settings Wi-Fi strings am: e0a6d1640a
am: ba2acc4ba0

Change-Id: Ica95727f87e7bc4d310f6daf52927b6b749bf313
2018-03-20 07:32:49 +00:00
Hall Liu
e3b9578658 Merge "Split "Mobile Network Type" indication in Settings" into pi-dev am: 8837f992bb
am: 0738a917df

Change-Id: I5ee44871c48d6052b1d62f4cbd8dd1ed76bd74e6
2018-03-20 07:12:38 +00:00
Lei Yu
306f7312f4 Merge "Update the mechanism to upload new anomaly config" into pi-dev am: d06991821f
am: f31a7c546d

Change-Id: I6e6f5492a7fafedd74e88a51ef977ccab1e78f5d
2018-03-20 05:58:53 +00:00
Phil Weaver
03f49cf863 Merge "Update string for dwell click timing" into pi-dev am: c10659cee7
am: 5f6dd9b4f2

Change-Id: Ied2a98e49ccb06b8196ded44b081f6768d09d743
2018-03-20 05:22:49 +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
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
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
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
TreeHugger Robot
43adc4448c Merge "Revert "Disable R8 for Settings"" 2018-03-20 00:20:46 +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
Doris Ling
f38d78bf09 Revert "Disable R8 for Settings"
This reverts commit f416cf775e.

Revert reason: this change is breaking Settings app presubmit test

Bug: 74834445
Change-Id: Ibfc1b8003ccb4044ded2a8d5661fb45bf3d090f5
2018-03-19 21:44:49 +00:00
Hall Liu
8837f992bb Merge "Split "Mobile Network Type" indication in Settings" into pi-dev 2018-03-19 21:15:26 +00: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
Lei Yu
cd38d0e16a Merge "Remove dupe key in UniquePreferenceTest" into pi-dev am: dcf7b68920
am: 7f14fa4f7d

Change-Id: Ic84a9db8e3df9f11d2961a4ff9932c11d4cbfe69
2018-03-19 20:06:31 +00:00
Phil Weaver
c10659cee7 Merge "Update string for dwell click timing" into pi-dev 2018-03-19 19:58:02 +00:00
Jong Wook Kim
056aea7eff Merge "Display "MAC address is randomized" in Wifi Preference Page" into pi-dev am: 8a022d8693
am: 3520bfc36d

Change-Id: I153088f7ee8f7284b9c8b3122e449b24bf71a96f
2018-03-19 19:39:22 +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