Commit Graph

43568 Commits

Author SHA1 Message Date
HJ ChangLiao
baaf1fdfe8 Merge "Remove touch effect of Ratio on listitem" into pi-dev am: a976a0eaad
am: 632d6e06ca

Change-Id: I2555f708d14dd41d9ba665504f11ac1590f7900d
2018-03-20 14:30:35 +00:00
HJ ChangLiao
632d6e06ca Merge "Remove touch effect of Ratio on listitem" into pi-dev
am: a976a0eaad

Change-Id: Id8226bd927f8553335e88cce4bd3fe4a2d81833b
2018-03-20 14:20:04 +00:00
TreeHugger Robot
a976a0eaad Merge "Remove touch effect of Ratio on listitem" into pi-dev 2018-03-20 14:07:26 +00:00
Yvonne Yang
03315c6b6f Make the preference not selectable am: 7ac7d7b660
am: 2576b0467b

Change-Id: I89c6e218760b4613529abad1030c5d8c89e04f19
2018-03-20 11:46:37 +00:00
Yvonne Yang
2576b0467b Make the preference not selectable
am: 7ac7d7b660

Change-Id: I2a3f289bbf5881d99674b9b8af5eb61dad04b508
2018-03-20 11:37:31 +00:00
Yvonne Yang
7ac7d7b660 Make the preference not selectable
"Battery usage data isn't available" should not respond to taps

Bug: 69312966
Test: Manual test
Change-Id: Id450c5a6089a4fb78a5c48a0f460992dc89f49ec
2018-03-20 08:41:46 +00:00
Antony Sargent
b435d464af Merge "Reword settings suggestion tile text for airplane mode" into pi-dev am: cbf9300cd2
am: 0c028eaf69

Change-Id: I8caa982aedffafa227324c20fd5c724335e953a9
2018-03-20 08:35:40 +00:00
ryanywlin
59e9abaaa2 Merge "Add "take call on" string for audio output switcher." into pi-dev am: cd908497d6
am: ef680f82db

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

Change-Id: I4ba38734eed324bcb25329d5303ff83032a3ab44
2018-03-20 08:34:15 +00:00
Lei Yu
cbbe4a337f Merge "Add summary for battery manager preference" into pi-dev am: 06d5188a71
am: fca54d8788

Change-Id: I1bcdf59eefafeca6b63689a8bb68add13f11d962
2018-03-20 08:33:21 +00:00
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
Antony Sargent
0c028eaf69 Merge "Reword settings suggestion tile text for airplane mode" into pi-dev
am: cbf9300cd2

Change-Id: Ic2feab06f0d9aeb9e9b404747e7bd6fb44f40ac3
2018-03-20 06:46:06 +00:00
TreeHugger Robot
cbf9300cd2 Merge "Reword settings suggestion tile text for airplane mode" into pi-dev 2018-03-20 06:37:35 +00:00
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
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
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
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
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