TreeHugger Robot
bad38a1940
Merge "Update "Vibrate on tap" string" into pi-dev
2018-03-22 05:03:38 +00:00
TreeHugger Robot
ce447d9191
Merge "Add back the data saver preference." into pi-dev
2018-03-22 04:56:35 +00:00
Fan Zhang
dad7af995b
Merge "use placeholder text for "turn on battery saver at x%" pref" into pi-dev am: c15e8d3d09
...
am: 39256ded6e
Change-Id: I9247609d8fc029686abbe58edd44924d5d5ede82
2018-03-22 04:43:16 +00:00
Fan Zhang
39256ded6e
Merge "use placeholder text for "turn on battery saver at x%" pref" into pi-dev
...
am: c15e8d3d09
Change-Id: I9247c14adb18887984ff759da0c5927189ae7d2a
2018-03-22 04:36:48 +00:00
TreeHugger Robot
c15e8d3d09
Merge "use placeholder text for "turn on battery saver at x%" pref" into pi-dev
2018-03-22 04:32:18 +00:00
Sundeep Ghuman
372a7996fd
Merge "Modify "Updated ..." text." into pi-dev am: 119d95bae1
...
am: 4166aa0757
Change-Id: Ied53957deefc6ffb7e5cfb363c2a8ff7ffbd14d4
2018-03-22 03:11:57 +00:00
Sundeep Ghuman
4166aa0757
Merge "Modify "Updated ..." text." into pi-dev
...
am: 119d95bae1
Change-Id: If1b339d684f14d76427a6830d0c5eb3d95a74488
2018-03-22 03:05:26 +00:00
TreeHugger Robot
119d95bae1
Merge "Modify "Updated ..." text." into pi-dev
2018-03-22 02:58:41 +00:00
Andreas Terzis
446cd9db73
Add back the data saver preference.
...
Bug: 70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: Ia39cb62ec021ae568a76fed04776b5e531e63b36
2018-03-21 19:23:05 -07:00
Maurice Lam
3e3b8a9618
Make GLIF theme default for confirm lock screen
...
Use GLIF theme as the default for confirm lock screen, even for
"external" launches of the screen. Renamed the theme from "internal"
to "normal" to reflect this change.
Dark theme code will be cleaned up later.
Test: Existing tests pass
Bug: 62573742
Change-Id: I86958eb3a440d7274807f1cf453c3e53c16c23e7
2018-03-21 18:21:04 -07:00
Fan Zhang
fff15d57c2
use placeholder text for "turn on battery saver at x%" pref
...
Change-Id: I63f0994bbcb050473c21c606337accd63cfcc46c
Fixes: 74120099
Test: reindex search
2018-03-21 17:38:30 -07:00
TreeHugger Robot
4ed1ed2465
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-03-22 00:23:30 +00:00
Lei Yu
44a327d2a1
Merge "Add string for adaptive brightness" into pi-dev am: 6cc043ba06
...
am: 6619f260db
Change-Id: I01708c4ea069c104d73e3a986b6cd8790289cfce
2018-03-22 00:07:37 +00:00
Lei Yu
0861b33763
Merge "Add search index provider for bt page" into pi-dev am: 9492aa546d
...
am: bfc77e7106
Change-Id: Ia173dfe64eda2148e5d8d17f8708ab788b2c68e0
2018-03-21 23:33:39 +00:00
Salvador Martinez
69fb4439ed
Merge "Update AP preference to not be master switch pref" into pi-dev am: 24c104a16e
...
am: 81c8c0d80e
Change-Id: I7b7940b4a14b342627e7e3aa623fed0aee9fdf95
2018-03-21 23:22:21 +00:00
Lei Yu
6619f260db
Merge "Add string for adaptive brightness" into pi-dev
...
am: 6cc043ba06
Change-Id: I19ed4d100add055cf280d6c704c1e148a722f92e
2018-03-21 23:01:26 +00:00
Shawn Ding
5939fd8360
Merge "Correct typo for "Redirect vibration"" into pi-dev am: 757b3d48e3
...
am: e80f1d0789
Change-Id: I2ff1aebad47bdb583d9142c8fe91444b6b070490
2018-03-21 22:52:20 +00:00
Lei Yu
6cc043ba06
Merge "Add string for adaptive brightness" into pi-dev
2018-03-21 22:35:01 +00:00
Sundeep Ghuman
9bfbc3f1fd
Modify "Updated ..." text.
...
Use d/h/m "narrow" time formatting with no period.
Change font style when update is "old."
Bug: 70950124
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=DataUsageSummaryPreferenceTest
Change-Id: I25902c98eb0fdf4dd2f64c3f5d668b5efdcdff0c
2018-03-21 15:24:43 -07:00
Lei Yu
bfc77e7106
Merge "Add search index provider for bt page" into pi-dev
...
am: 9492aa546d
Change-Id: Ia06828d5c36f14cc419800bba15f376c3701b917
2018-03-21 22:08:24 +00:00
Salvador Martinez
81c8c0d80e
Merge "Update AP preference to not be master switch pref" into pi-dev
...
am: 24c104a16e
Change-Id: I0e9389e086086dc511f6b702bf042fec55dbd534
2018-03-21 22:02:04 +00:00
Shawn Ding
e80f1d0789
Merge "Correct typo for "Redirect vibration"" into pi-dev
...
am: 757b3d48e3
Change-Id: I873cd92bd6fd2eeacf511dcba2a95a0548ea4033
2018-03-21 21:55:25 +00:00
Maurice Lam
e13e319e0c
Separate skip and clear button in pattern screen
...
So that the action performed is always the same as what the button
label says.
Test: m -j RunSettingsRoboTests
Bug: 72197171
Change-Id: Ia2a02b630a86874d002e462e41fdf676c2d27203
2018-03-21 14:06:07 -07:00
Bill Yi
d12d5cac31
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6cc802e72ebf5753bf7441dc6c9232379d9e17f2
2018-03-21 14:03:26 -07:00
TreeHugger Robot
9492aa546d
Merge "Add search index provider for bt page" into pi-dev
2018-03-21 20:48:41 +00:00
Lei Yu
0cc9a92665
Add string for adaptive brightness
...
Bug: 69795935
Test: Build
Change-Id: If99bd796711f3e77ef5e88533b3a6d683acc54e3
2018-03-21 13:00:15 -07:00
TreeHugger Robot
24c104a16e
Merge "Update AP preference to not be master switch pref" into pi-dev
2018-03-21 19:52:05 +00:00
Julia Reynolds
15dfbbec06
Add a setting for the volume hush gesture
...
Bug: 75252670
Test: make -j20 RunSettingsRoboTests
Change-Id: I699aeec54eb516931b6d7c5b3fc864b169015c2f
2018-03-21 15:27:54 -04:00
Andrew Sapperstein
23fbc3acf9
Merge "Update material_deep_teal_500 to #008577." into pi-dev am: 3749a8d871
...
am: 4b6cdc6b04
Change-Id: Ie8d15a1efdd54a2b35c38391ee1860a832cd7cbb
2018-03-21 19:21:12 +00:00
Philip P. Moltmann
b88b260227
Merge "Recover print job ID from intent extras" into pi-dev am: 61e6b87e7d
...
am: 57a64606da
Change-Id: Id4ae32070d679616a52c02fadb9ce97ef9ae3fc1
2018-03-21 19:20:37 +00:00
Jyun LuoLai
6ae743f957
Merge "Modify connectivty related strings" into pi-dev am: 346a36cd2e
...
am: 73af1f3fb7
Change-Id: Ib8da644dc0c84ddb2d0133643de6325c0fbdc2c2
2018-03-21 19:20:10 +00:00
TreeHugger Robot
757b3d48e3
Merge "Correct typo for "Redirect vibration"" into pi-dev
2018-03-21 19:03:53 +00:00
TreeHugger Robot
ce5bed1366
Merge "Import translations. DO NOT MERGE"
2018-03-21 18:52:29 +00:00
Andrew Sapperstein
4b6cdc6b04
Merge "Update material_deep_teal_500 to #008577." into pi-dev
...
am: 3749a8d871
Change-Id: I7892793d65ec47e25141c0d4cbe1aade8caf9843
2018-03-21 18:44:38 +00:00
Philip P. Moltmann
57a64606da
Merge "Recover print job ID from intent extras" into pi-dev
...
am: 61e6b87e7d
Change-Id: If6a4b87329463abd1aaf833c3cfd73147765c5a6
2018-03-21 18:43:53 +00:00
Jyun LuoLai
73af1f3fb7
Merge "Modify connectivty related strings" into pi-dev
...
am: 346a36cd2e
Change-Id: Ia49102de0aa3a881ae69d43ec3612d1e17e5562a
2018-03-21 18:43:26 +00:00
Lei Yu
687964cf28
Add search index provider for bt page
...
1. Implement the search index provider for
ConnectedDeviceDashboardFragment.
2. Since in SEARCH_INDEX_DATA_PROVIDER fragment is null,
so we need to pass in context to all components
instead of getting it from fragment.
3. Update test for it as well as creating new shadow.
Change-Id: If0aa67d5b6ca207c6b728c8355581bf414577091
Fixes: 69333961
Test: RunSettingsRoboTests
2018-03-21 10:46:02 -07:00
TreeHugger Robot
3749a8d871
Merge "Update material_deep_teal_500 to #008577." into pi-dev
2018-03-21 17:45:25 +00:00
Salvador Martinez
6ddc4b4996
Update AP preference to not be master switch pref
...
People keep getting confused by the master switch preference for
wireless tethering. The wireless tethering page already has a switch
so this just removes it from the preference and has it take you to
the page when tapped on instead.
Bug: 69423941
Test: robotests
Change-Id: I66d6d3271e83b49ae77f203e7892438d27f96025
2018-03-21 10:36:56 -07:00
TreeHugger Robot
61e6b87e7d
Merge "Recover print job ID from intent extras" into pi-dev
2018-03-21 17:29:35 +00:00
TreeHugger Robot
346a36cd2e
Merge "Modify connectivty related strings" into pi-dev
2018-03-21 17:14:20 +00:00
arangelov
75c603cedb
Show policy transparency popup dialog for Bluetooth in Settings.
...
Bug: 70206452
Test: make ROBOTEST_FILTER=BluetoothEnablerTest -j40 RunSettingsRobotests
Test: make ROBOTEST_FILTER=BluetoothSwitchPreferenceControllerTest -j40 RunSettingsRobotests
Change-Id: I543cf69b754c44b02c66e101698f10906a1b957f
2018-03-21 16:03:28 +00:00
Pavel Grafov
d05988a043
Merge "Move work profile notification settings to the bottom." into pi-dev am: d174ceb27b
...
am: 35b901c97f
Change-Id: I50c2899490f8250a11759b37fbd83095561bc433
2018-03-21 15:40:02 +00:00
Pavel Grafov
35b901c97f
Merge "Move work profile notification settings to the bottom." into pi-dev
...
am: d174ceb27b
Change-Id: I25f852eba45c4a2f3c0106f425e3f02a82600951
2018-03-21 15:26:37 +00:00
Philip P. Moltmann
b85ab7e979
Recover print job ID from intent extras
...
If the fragment was started via ACTION_PRINT_SETTINGS the intent extra
does not get transformed into a fragment argument. Hence need to check
the intent extra.
Fixes: 74456525
Test: Opened print job settings from a print notification,
atest com.android.settings.print.PrintJobSettingsActivityTest
Change-Id: I6c4605309c348456a862c4d7b48a11400b62fb70
2018-03-21 08:13:45 -07:00
TreeHugger Robot
d174ceb27b
Merge "Move work profile notification settings to the bottom." into pi-dev
2018-03-21 15:01:33 +00:00
Fengjen Wu
63cb104551
Merge "Add divider line in Multiple users screen" into pi-dev am: 1a7e4daa95
...
am: f727a0ab12
Change-Id: Icb403030444e866ea6ecb9f9d315d88e017a5324
2018-03-21 09:40:35 +00:00
Shawn Ding
b9260ae13e
Merge "Update string for "Use vibrator" setting" into pi-dev am: c5491014ab
...
am: ddf17c73bb
Change-Id: I98ef7c8c7df7bbcd752b5981c4cf7abe1194ba41
2018-03-21 09:40:08 +00:00
Will Chen
0e8431d1b9
Merge "Remove period on "Fingerprint added" screen" into pi-dev am: f61edcc7f8
...
am: d86798231d
Change-Id: Ice9e83584f10e8ccc7ff5ad9a005469d28f20f24
2018-03-21 09:39:31 +00:00
Jan Nordqvist
b58ae73c15
Merge "Fixed "Primary data" text style and rearranged UI vertically." into pi-dev am: 9055c1b655
...
am: 2adf86a3c7
Change-Id: Ic2b220414331ee842f5042d5a078aa40463a74cd
2018-03-21 09:38:22 +00:00