OSDN Git Service
yuemingw [Mon, 26 Mar 2018 18:51:49 +0000 (18:51 +0000)]
Merge "Remove account should show policy transparency dialog when DISALLOW_MODIFY_ACCOUNTS is set." into pi-dev am:
21926abed2
am:
a3db549834
Change-Id: If7c967d8bf7eddf3a50bd3d629e3e79c85fac5e6
yuemingw [Mon, 26 Mar 2018 18:46:09 +0000 (18:46 +0000)]
Merge "Remove account should show policy transparency dialog when DISALLOW_MODIFY_ACCOUNTS is set." into pi-dev
am:
21926abed2
Change-Id: Ie4130e88a3355bb91a63578bd889147da3dba726
TreeHugger Robot [Mon, 26 Mar 2018 18:34:31 +0000 (18:34 +0000)]
Merge "Remove account should show policy transparency dialog when DISALLOW_MODIFY_ACCOUNTS is set." into pi-dev
Rubin Xu [Mon, 26 Mar 2018 18:24:20 +0000 (18:24 +0000)]
Merge "Block simple numeric passwords in ChooseLockPassword" into pi-dev am:
c3938f6f6e
am:
d80739b276
Change-Id: I73ae8b22e3b1baec1ecca97a68210113fe08d758
Rubin Xu [Mon, 26 Mar 2018 18:19:05 +0000 (18:19 +0000)]
Merge "Block simple numeric passwords in ChooseLockPassword" into pi-dev
am:
c3938f6f6e
Change-Id: I8599fbcfc070842d7f4755cbcda5e1dcf80f91a5
TreeHugger Robot [Mon, 26 Mar 2018 18:06:04 +0000 (18:06 +0000)]
Merge "Block simple numeric passwords in ChooseLockPassword" into pi-dev
Julia Reynolds [Mon, 26 Mar 2018 17:50:47 +0000 (17:50 +0000)]
Update recently sent preferences am:
5c83f14d7e
am:
6a942f930b
Change-Id: I4088f66e3c798a30043ccb6e48685f3fa5f7700d
Julia Reynolds [Mon, 26 Mar 2018 17:41:20 +0000 (17:41 +0000)]
Update recently sent preferences
am:
5c83f14d7e
Change-Id: I71d6da7beba2beecad671e296c76a127815fe241
yuemingw [Mon, 12 Mar 2018 16:38:50 +0000 (16:38 +0000)]
Remove account should show policy transparency dialog when DISALLOW_MODIFY_ACCOUNTS
is set.
createAdminIntentSupport always checks user restrictions on user 0(
if called from system uid) so can't be used here when account could
be work profile account.
Bug:
70674230
Test: m -j RunSettingsRobotests
Change-Id: Ibd2df8891d9fa7b4c85c42a305c5db2acd4c829b
Julia Reynolds [Wed, 21 Mar 2018 20:10:20 +0000 (16:10 -0400)]
Update recently sent preferences
Test: make -j RunSettingsRoboTests
Bug:
74318867
Fixes:
73004227
Change-Id: Icecf1d4f0e3dd38c96919874a7f614ed93a001ab
Rubin Xu [Thu, 25 Jan 2018 21:12:57 +0000 (21:12 +0000)]
Block simple numeric passwords in ChooseLockPassword
Fix the previously-missing case where the user elects to set
a password (instead of PIN), but still sets a numeric password
that contains repeated sequence which should be blocked by admin
policy.
Bug:
72039850
Test: Set NUMERIC_COMPLEX password quality, then attempt to
enroll a repeating numeric PIN as lockscreen *password*
Change-Id: I7c7525716b37a5330147b899b80026ca71c3ce0c
Benjamin Franz [Mon, 26 Mar 2018 09:42:31 +0000 (09:42 +0000)]
Merge "Do not allow force stopping protected packages" into pi-dev am:
396e91abf0
am:
c81072f6ab
Change-Id: I03da3f59434e58936afb6646d393393a8899965e
Benjamin Franz [Mon, 26 Mar 2018 09:24:02 +0000 (09:24 +0000)]
Merge "Do not allow force stopping protected packages" into pi-dev
am:
396e91abf0
Change-Id: I725a5a666ef7155fe98d6beb4d9c5ec461af4377
Benjamin Franz [Mon, 26 Mar 2018 09:15:41 +0000 (09:15 +0000)]
Merge "Do not allow force stopping protected packages" into pi-dev
Jeff Sharkey [Sun, 25 Mar 2018 09:06:30 +0000 (09:06 +0000)]
Merge "Add UX string tweaks before string freeze." into pi-dev am:
d6e81ab51b
am:
029834a93e
Change-Id: I3c1fe048e4ba9a9098e1c9dfdd3831dcf28c10eb
Jeff Sharkey [Sun, 25 Mar 2018 08:59:57 +0000 (08:59 +0000)]
Merge "Add UX string tweaks before string freeze." into pi-dev
am:
d6e81ab51b
Change-Id: Id413301fb3794dbe6055ba76efbfd6099dfbde8d
Jeff Sharkey [Sun, 25 Mar 2018 08:49:58 +0000 (08:49 +0000)]
Merge "Add UX string tweaks before string freeze." into pi-dev
Matthew Fritze [Sat, 24 Mar 2018 07:59:35 +0000 (07:59 +0000)]
Merge "Return back-up slices for unavailable settings" into pi-dev am:
362ba01789
am:
2cc4516030
Change-Id: Iaf5c385ebae91340294b027ee6037bb0589fa607
Maurice Lam [Sat, 24 Mar 2018 07:58:42 +0000 (07:58 +0000)]
Merge "Separate skip and clear button in pattern screen" into pi-dev am:
59b25d0043
am:
f95ec59cbf
Change-Id: Ia8aeb392ce080533c503d3cf4e9b6e9370425e87
Doris Ling [Sat, 24 Mar 2018 07:57:22 +0000 (07:57 +0000)]
Merge "Add toggle title for Data Saver" into pi-dev am:
c812ec6c89
am:
4d3390d619
Change-Id: I58b7c65faa67e70a261b5ceebfd787d3159c9cbd
Lei Yu [Sat, 24 Mar 2018 07:56:32 +0000 (07:56 +0000)]
Merge "Add callback when tethering fails" into pi-dev am:
1682085feb
am:
7fcde4490c
Change-Id: Ie1e512ffa61b138769b25bf0c54bc459940f91fc
Fan Zhang [Sat, 24 Mar 2018 07:55:43 +0000 (07:55 +0000)]
Merge ""My Phone" -> "About Phone"" into pi-dev am:
6ab6ed4e7a
am:
bb40b8e157
Change-Id: I3d8c617eec7fc1cf739094d834eede3af785e42a
Fan Zhang [Sat, 24 Mar 2018 07:54:54 +0000 (07:54 +0000)]
Merge "Add preference controller to launch app-time-spent UI." into pi-dev am:
30da391fa0
am:
490eaa1c8c
Change-Id: Ic19a6b808359f45a8c51d06de04d635d1ea10ceb
Sean Callanan [Sat, 24 Mar 2018 07:53:36 +0000 (07:53 +0000)]
Merge "[Settings] Add strings for Natural and Automatic color modes" into pi-dev am:
8d8ee565b1
am:
ee8a899d89
Change-Id: Ie9efef5b5a8abe1a16048a129ad770048342438c
Beverly [Sat, 24 Mar 2018 07:50:56 +0000 (07:50 +0000)]
Merge "Add string for app info summary" into pi-dev am:
2e32d30298
am:
714c5fad50
Change-Id: If7cd1cd90e7cb7ec50e5b4bbf627e0624b011b5c
Doris Ling [Sat, 24 Mar 2018 07:47:39 +0000 (07:47 +0000)]
Merge "Update title text for finterprint suggestion." into pi-dev am:
7bf63eb62a
am:
c69a2a1b6d
Change-Id: I0ae5e6ec09c21914f384d9cf66c23538b3a17777
Stanley Tng [Sat, 24 Mar 2018 07:35:48 +0000 (07:35 +0000)]
Merge "Add new strings for Hearing Aid profile in Accessibility app" into pi-dev am:
53332b6dcf
am:
36f2f35b8c
Change-Id: I8ef143a25ed8cb9d90dfd961f97b0e6ebcdd6c06
Matthew Fritze [Sat, 24 Mar 2018 07:17:35 +0000 (07:17 +0000)]
Merge "Return back-up slices for unavailable settings" into pi-dev
am:
362ba01789
Change-Id: Ic4dbd881bbe0bc5044b148a4c57736a1a0dc9fac
TreeHugger Robot [Sat, 24 Mar 2018 07:04:47 +0000 (07:04 +0000)]
Merge "Return back-up slices for unavailable settings" into pi-dev
Maurice Lam [Sat, 24 Mar 2018 05:55:25 +0000 (05:55 +0000)]
Merge "Separate skip and clear button in pattern screen" into pi-dev
am:
59b25d0043
Change-Id: Ibd042c0e3686e899e22a144295829309bc623fa4
TreeHugger Robot [Sat, 24 Mar 2018 05:46:35 +0000 (05:46 +0000)]
Merge "Separate skip and clear button in pattern screen" into pi-dev
Doris Ling [Sat, 24 Mar 2018 05:36:14 +0000 (05:36 +0000)]
Merge "Add toggle title for Data Saver" into pi-dev
am:
c812ec6c89
Change-Id: Idc9711ebf92a19337e79a01665c8a46330634fda
Lei Yu [Sat, 24 Mar 2018 05:33:56 +0000 (05:33 +0000)]
Merge "Add callback when tethering fails" into pi-dev
am:
1682085feb
Change-Id: I453702ec5cba4ea5d65d3287acc75d2adc4890e4
TreeHugger Robot [Sat, 24 Mar 2018 05:30:28 +0000 (05:30 +0000)]
Merge "Add toggle title for Data Saver" into pi-dev
Fan Zhang [Sat, 24 Mar 2018 05:24:32 +0000 (05:24 +0000)]
Merge ""My Phone" -> "About Phone"" into pi-dev
am:
6ab6ed4e7a
Change-Id: I892a6697735121389b4f8797bfadfde4f5b93602
TreeHugger Robot [Sat, 24 Mar 2018 05:24:09 +0000 (05:24 +0000)]
Merge "Add callback when tethering fails" into pi-dev
Fan Zhang [Sat, 24 Mar 2018 05:23:53 +0000 (05:23 +0000)]
Merge "Add preference controller to launch app-time-spent UI." into pi-dev
am:
30da391fa0
Change-Id: Id6ac2c1980a2fb9ab995168a204295b08cf8e2d8
Sean Callanan [Sat, 24 Mar 2018 05:23:17 +0000 (05:23 +0000)]
Merge "[Settings] Add strings for Natural and Automatic color modes" into pi-dev
am:
8d8ee565b1
Change-Id: I147f0648d976094b291b49c2649d8529930436be
Beverly [Sat, 24 Mar 2018 05:22:40 +0000 (05:22 +0000)]
Merge "Add string for app info summary" into pi-dev
am:
2e32d30298
Change-Id: I96ddc68b7262503a71dc4faf56aef30021e63c87
Fan Zhang [Sat, 24 Mar 2018 05:16:01 +0000 (05:16 +0000)]
Merge ""My Phone" -> "About Phone"" into pi-dev
Doris Ling [Sat, 24 Mar 2018 05:15:50 +0000 (05:15 +0000)]
Merge "Update title text for finterprint suggestion." into pi-dev
am:
7bf63eb62a
Change-Id: I566d7bfbcef79ad3231b74dbfb72976459fd5563
TreeHugger Robot [Sat, 24 Mar 2018 05:14:32 +0000 (05:14 +0000)]
Merge "Add preference controller to launch app-time-spent UI." into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 05:14:29 +0000 (05:14 +0000)]
Merge "[Settings] Add strings for Natural and Automatic color modes" into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 05:14:24 +0000 (05:14 +0000)]
Merge "Add string for app info summary" into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 04:58:29 +0000 (04:58 +0000)]
Merge "Update title text for finterprint suggestion." into pi-dev
Stanley Tng [Sat, 24 Mar 2018 04:23:02 +0000 (04:23 +0000)]
Merge "Add new strings for Hearing Aid profile in Accessibility app" into pi-dev
am:
53332b6dcf
Change-Id: Id736294962a1aa79e1e93647abca38bc4a9c575a
Stanley Tng [Sat, 24 Mar 2018 04:09:04 +0000 (04:09 +0000)]
Merge "Add new strings for Hearing Aid profile in Accessibility app" into pi-dev
Daniel Nishi [Sat, 24 Mar 2018 04:08:07 +0000 (04:08 +0000)]
Merge "Add string to warn users about device name." into pi-dev am:
0d221f7767
am:
8537eeb1e9
Change-Id: I8e770ba62dbcb9d95c1246b23c8134b32ba36911
Tony Mak [Sat, 24 Mar 2018 03:14:55 +0000 (03:14 +0000)]
Merge "Updates the policy transparency dialog string" into pi-dev am:
95e22fa7bd
am:
6f924f55b7
Change-Id: I088eea88abdbde838ebe364289cda1f50187a0e5
Victor Chang [Sat, 24 Mar 2018 03:10:48 +0000 (03:10 +0000)]
Merge "New strings for time zone picker" into pi-dev am:
6c737f9790
am:
04766dba13
Change-Id: Ia485d022a01ada5286e35b5935ee844aa3219e7f
Salvador Martinez [Sat, 24 Mar 2018 03:04:41 +0000 (03:04 +0000)]
Merge "Add new strings for auto-wifi" into pi-dev am:
553c2778af
am:
8faae1eebb
Change-Id: Ie2733871f24a873ebcad12f752fd41f6fa2032fa
Salvador Martinez [Sat, 24 Mar 2018 02:57:35 +0000 (02:57 +0000)]
Merge "Add extra strings for hidden network option" into pi-dev am:
8bbb4082bb
am:
d53258e023
Change-Id: Ic780a8fbe4bf63e4cd1e5252dfc79e09057c9362
Daniel Nishi [Sat, 24 Mar 2018 02:23:24 +0000 (02:23 +0000)]
Merge "Add string to warn users about device name." into pi-dev
am:
0d221f7767
Change-Id: I4863d112cedaecf0f14c3355c0b350ba03eb297e
Salvador Martinez [Sat, 24 Mar 2018 01:47:15 +0000 (01:47 +0000)]
Merge "Add strings for mobile hotspot bands" into pi-dev am:
5cfebe55ea
am:
22098f44b4
Change-Id: I772f8bc088a4b539f51bba84563271b13389c4ab
Rohan Shah [Sat, 24 Mar 2018 01:22:58 +0000 (01:22 +0000)]
Merge "[QS] Add Settings intent filters for Data Usage" into pi-dev am:
1ff54d7e05
am:
742dc0097b
Change-Id: If957235f76ec7b4e60e4aca3070076137bf70504
Daniel Nishi [Sat, 24 Mar 2018 01:04:21 +0000 (01:04 +0000)]
Merge "Add string to warn users about device name." into pi-dev
Tony Mak [Sat, 24 Mar 2018 00:55:35 +0000 (00:55 +0000)]
Merge "Updates the policy transparency dialog string" into pi-dev
am:
95e22fa7bd
Change-Id: I87885dd2ff53204017e547769c8d5641609fbf5a
Tony Mak [Sat, 24 Mar 2018 00:35:02 +0000 (00:35 +0000)]
Merge "Updates the policy transparency dialog string" into pi-dev
Stanley Tng [Fri, 23 Mar 2018 23:59:50 +0000 (16:59 -0700)]
Add new strings for Hearing Aid profile in Accessibility app
These new strings will be used by the Accessibility Settings App for the
hearing aid profile.
Test: compiled.
Bug:
74204427
Change-Id: I41cd5c2152a8b8dacb3dd4e5f974d1427d4a7ba4
Jeff Sharkey [Wed, 21 Mar 2018 17:14:56 +0000 (11:14 -0600)]
Add UX string tweaks before string freeze.
We're fully intending to implement some string and layout tweaks
requested by UX, but we need to get the requested strings checked
in before the strings deadline. We carefully keep existing (legacy)
strings intact to avoid any runtime crashes until we get the layout
work done.
Test: builds, boots
Bug:
76097999
Change-Id: Ic6531de170df8eaa8b3a0a23d76a0c8821bb5b16
Victor Chang [Fri, 23 Mar 2018 23:24:18 +0000 (23:24 +0000)]
Merge "New strings for time zone picker" into pi-dev
am:
6c737f9790
Change-Id: I52ff1e792c10da219060eddf8ff7f3db42620113
Salvador Martinez [Fri, 23 Mar 2018 22:30:36 +0000 (22:30 +0000)]
Merge "Add new strings for auto-wifi" into pi-dev
am:
553c2778af
Change-Id: Ie344d56a288aaf643b507d25496ea4c3f85a32d5
Salvador Martinez [Fri, 23 Mar 2018 22:26:39 +0000 (22:26 +0000)]
Merge "Add extra strings for hidden network option" into pi-dev
am:
8bbb4082bb
Change-Id: Id1b4364c37c7bb482312b442ee6f517005cac96b
Victor Chang [Fri, 23 Mar 2018 22:23:23 +0000 (22:23 +0000)]
Merge "New strings for time zone picker" into pi-dev
Salvador Martinez [Fri, 23 Mar 2018 22:16:13 +0000 (22:16 +0000)]
Merge "Add strings for mobile hotspot bands" into pi-dev
am:
5cfebe55ea
Change-Id: I6b6ef32dc0d93002c5e1c04049d638e42c1e22ab
TreeHugger Robot [Fri, 23 Mar 2018 22:11:24 +0000 (22:11 +0000)]
Merge "Import translations. DO NOT MERGE"
Rohan Shah [Fri, 23 Mar 2018 22:04:44 +0000 (22:04 +0000)]
Merge "[QS] Add Settings intent filters for Data Usage" into pi-dev
am:
1ff54d7e05
Change-Id: I63d45796dcebb66db56d795054443b75a771c0df
Fan Zhang [Fri, 23 Mar 2018 22:01:56 +0000 (22:01 +0000)]
Merge "Add string needed by app usage tracking feature." into pi-dev am:
80bf63a2dd
am:
f3fcb03c86
Change-Id: Ibce6ce6ca611f5ef6e39872303fc4e3e608d137c
Matthew Fritze [Fri, 23 Mar 2018 21:55:14 +0000 (21:55 +0000)]
Merge "Add keywords for search terms" into pi-dev am:
dd0e23b987
am:
49a3169cb4
Change-Id: I16065c59992f75fc9e45be4bd4b313a0691b13be
Christine Franks [Fri, 23 Mar 2018 21:51:05 +0000 (21:51 +0000)]
Merge "Add strings for night display UX changes" into pi-dev am:
0aa142ff18
am:
f1cc3ad4a1
Change-Id: Id37f77209f3bb184f06cb7451bb1698307fa5396
Doris Ling [Fri, 23 Mar 2018 21:45:52 +0000 (21:45 +0000)]
Merge "Update battery saver condition text." into pi-dev am:
96a85d6aca
am:
e6f6441255
Change-Id: I2836de5db3950e01d0548c6443c1bbe4e104cd9e
Salvador Martinez [Fri, 23 Mar 2018 21:39:13 +0000 (21:39 +0000)]
Merge "Add new string for updating auto-wifi" into pi-dev am:
e9b0ba9bac
am:
61266a2c29
Change-Id: I1a2df19f2dbc93b4ab4b77bd28ff812e23b57d0c
Fan Zhang [Fri, 23 Mar 2018 20:02:24 +0000 (13:02 -0700)]
Add preference controller to launch app-time-spent UI.
Bug:
74580195
Test: robotests
Change-Id: Iba9338f04cc037a134ef9445ce97cbbe21f53833
Daniel Nishi [Fri, 23 Mar 2018 20:43:12 +0000 (13:43 -0700)]
"My Phone" -> "About Phone"
String polishing fix.
Bug:
36458278
Test: Manual
Change-Id: If0d90aa252d0ffe8bdbb8d255d1bec736ba2017a
Fan Zhang [Fri, 23 Mar 2018 20:58:53 +0000 (20:58 +0000)]
Merge "Add string needed by app usage tracking feature." into pi-dev
am:
80bf63a2dd
Change-Id: Iecd8186a7ab00da30f76ec7fb7f4ea05a197b72f
Matthew Fritze [Fri, 23 Mar 2018 20:55:16 +0000 (20:55 +0000)]
Merge "Add keywords for search terms" into pi-dev
am:
dd0e23b987
Change-Id: I799ea57dd55845562585deb1bd1d2856af671d7e
Jan Nordqvist [Fri, 23 Mar 2018 20:49:01 +0000 (20:49 +0000)]
Merge "Rename "Primary data" to "Current data"." into pi-dev am:
7884751938
am:
becfdd247f
Change-Id: I1c9126dd889f11ebda15a8eef50acf0aec99939a
Christine Franks [Fri, 23 Mar 2018 20:45:36 +0000 (20:45 +0000)]
Merge "Add strings for night display UX changes" into pi-dev
am:
0aa142ff18
Change-Id: Ib18f40bad556370bb3e56b223446754a9de8863c
Beverly [Fri, 23 Mar 2018 20:33:37 +0000 (16:33 -0400)]
Add string for app info summary
Test: n/a
Bug:
72442731
Change-Id: Ibdf83450159334647ba26b2c44ee6cc5b21638d7
Doris Ling [Fri, 23 Mar 2018 20:37:55 +0000 (20:37 +0000)]
Merge "Update battery saver condition text." into pi-dev
am:
96a85d6aca
Change-Id: Ia5e121af00fa07aae39f89b70a5a1dc36bb171d4
Salvador Martinez [Fri, 23 Mar 2018 20:33:19 +0000 (20:33 +0000)]
Merge "Add new string for updating auto-wifi" into pi-dev
am:
e9b0ba9bac
Change-Id: Ieeefa5bc8a8ad96f80905b8838d2d0357627e1ef
Salvador Martinez [Fri, 23 Mar 2018 20:33:07 +0000 (20:33 +0000)]
Merge "Add new strings for auto-wifi" into pi-dev
Salvador Martinez [Fri, 23 Mar 2018 20:32:16 +0000 (20:32 +0000)]
Merge "Add extra strings for hidden network option" into pi-dev
Jan Nordqvist [Fri, 23 Mar 2018 20:12:03 +0000 (20:12 +0000)]
Merge "Rename "Primary data" to "Current data"." into pi-dev
am:
7884751938
Change-Id: Ieac649b12d0df53a1102a619afd59be6463d7adc
Salvador Martinez [Fri, 23 Mar 2018 20:10:49 +0000 (20:10 +0000)]
Merge "Add strings for mobile hotspot bands" into pi-dev
Lei Yu [Fri, 23 Mar 2018 20:10:15 +0000 (20:10 +0000)]
Merge "Hide password for wifi tether" into pi-dev am:
9bb2efa0ff
am:
1684f605f7
Change-Id: I8351f06cfdf8e505e1c00c78bfc3daaca15703b4
Sean Callanan [Thu, 22 Mar 2018 02:28:37 +0000 (19:28 -0700)]
[Settings] Add strings for Natural and Automatic color modes
These strings are not properly reflected in the UI yet. Automatic and
Saturated currently map to the same display setting (and the UI reflects
this by checking both).
Bug:
75982435
Test: Modified the existing testcases to reflect the new string.
Change-Id: Iaef08599c0233e018eaafaf89d60eab92e102782
(cherry picked from commit
e8f9bf5f68853fc8bc5c828e7d5636e6851ec45a)
Daniel Nishi [Thu, 22 Mar 2018 21:06:53 +0000 (14:06 -0700)]
Add string to warn users about device name.
Device name is exposed to apps and through Bluetooth name and Wi-Fi
hotspot name. This warning tells users that before they set it.
Bug:
74981919
Test: Builds -- string currently unused.
Change-Id: I0b4bb49bcff6485a79688d98ca9bab1ce9948efd
Fan Zhang [Fri, 23 Mar 2018 20:03:54 +0000 (20:03 +0000)]
Merge changes I034a9f0a,Iad5ec577 into pi-dev am:
dd5977901d
am:
7e75de29b1
Change-Id: Ife81eb4fa926cd9a54e84ea4b9d5374c07e1a5b6
TreeHugger Robot [Fri, 23 Mar 2018 19:51:16 +0000 (19:51 +0000)]
Merge "[QS] Add Settings intent filters for Data Usage" into pi-dev
Neil Fuller [Fri, 23 Mar 2018 19:48:40 +0000 (19:48 +0000)]
Merge "Show time zone used in or after 2018 only" into pi-dev am:
cbaa984cde
am:
790a55fc97
Change-Id: Ibc62444b70c819f613df9e5c947cb6ec703af065
Matthew Fritze [Wed, 28 Feb 2018 18:31:06 +0000 (10:31 -0800)]
Return back-up slices for unavailable settings
When an inline slice is requested, and the setting is unavailable,
we should present more useful information to the user. This CL handles:
- Unsupported: return intent slice to Settings home page
- Disabled for user: intent to the setting page
- Unknown reason: intent to setting page
- Disabled dependency: Create intent-based Slice rather
than the requested inline slice.
Bug:
71640747
Test: robotests
Change-Id: I9c1a0ee36119d4f9f3b205e0824c251f4356db55
hylo [Fri, 23 Mar 2018 19:43:18 +0000 (19:43 +0000)]
Merge "Add string for forget confirmation dialog" into pi-dev am:
4b8715afa8
am:
ae943c5f4d
Change-Id: Id0915109c06f4fc55bd47facad574ee840196238
Tao Bao [Fri, 23 Mar 2018 19:36:57 +0000 (19:36 +0000)]
Merge "Add summary text for "Automatic system updates" option." into pi-dev am:
06bf8a21c6
am:
08888b75f8
Change-Id: I8f7d989bad4e605bdfd756afeb873d8fc00031ea
Victor Chang [Fri, 23 Mar 2018 19:24:41 +0000 (19:24 +0000)]
New strings for time zone picker
Bug:
75322108
Test: m SettingsGoogle
Change-Id: I04662384bf1487066b1dc91944b6f1d2115d509a
Doris Ling [Fri, 23 Mar 2018 19:24:58 +0000 (12:24 -0700)]
Update title text for finterprint suggestion.
Bug:
76098479
Test: rebuild
Change-Id: Id09a8019844ca5f6c528f4bd1b37117380e663b8
Fan Zhang [Fri, 23 Mar 2018 19:19:13 +0000 (19:19 +0000)]
Merge "Add string needed by app usage tracking feature." into pi-dev
Tony Mak [Fri, 23 Mar 2018 17:09:19 +0000 (17:09 +0000)]
Updates the policy transparency dialog string
Test: Build and observe the string.
Fixes:
68973125
Change-Id: Ic1461f8b7157cfcc50d6f4766fced725307b9cc0
Lei Yu [Fri, 23 Mar 2018 18:51:42 +0000 (18:51 +0000)]
Merge "Hide password for wifi tether" into pi-dev
am:
9bb2efa0ff
Change-Id: I7f82bf71672b6e966bf699ca17a215547c0dc8d9
Fan Zhang [Fri, 23 Mar 2018 18:46:08 +0000 (18:46 +0000)]
Merge changes I034a9f0a,Iad5ec577 into pi-dev
am:
dd5977901d
Change-Id: If135a04e461c80dafe0994010d6d1b36324a8f9a
OSDN Git Service
