Commit Graph

37828 Commits

Author SHA1 Message Date
Fan Zhang
e6b7bc6f15 Fix alignment for build number preference in RTL.
- Fixed by adding BidiFormatter.unicodeWrap around the whole string.

Change-Id: I3ca1292d912062db8c2fead524cd84a19eb80cff
Fix: 63135900
Test: make RunSettingsRoboTests
2017-07-05 14:20:08 -07:00
TreeHugger Robot
ff45106b49 Merge "Adjust UX for toggles when active scorer is not set." 2017-07-05 21:19:58 +00:00
Android Build Merger (Role)
f612e41f7d Merge "Merge "Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da" into oc-dr1-dev-plus-aosp am: 5daad21245" 2017-07-05 20:45:22 +00:00
Daniel Nishi
9e3b0ad50a Merge "Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da" into oc-dr1-dev-plus-aosp
am: 5daad21245

Change-Id: Ib220be0f72aab281187b0c3998c19c00a3ba26fb
2017-07-05 20:45:07 +00:00
Android Build Merger (Role)
6c3bdb2ca2 Merge "Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da am: d7685ec8c8" 2017-07-05 20:45:01 +00:00
Daniel Nishi
cb66524cdf Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da
am: d7685ec8c8

Change-Id: I4686e307154220b5190262f97b2af97c115d9bbe
2017-07-05 20:44:43 +00:00
Daniel Nishi
e2e4c1276a Merge "Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da" into oc-dr1-dev-plus-aosp
am: 5daad21245

Change-Id: I466eee3851df5a7abcf7ab2b310e32b1a2603c03
2017-07-05 20:44:42 +00:00
Daniel Nishi
ac4c095f3e Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da
am: d7685ec8c8

Change-Id: I59838e687f360a2121ff24be805a9f5cb090f639
2017-07-05 20:44:22 +00:00
jackqdyulei
e0fa4afc71 Merge "Update the method about foreground time." into oc-dr1-dev am: 96e774b7d7
am: b067dea683

Change-Id: I3ef03ee20157e41228ebe4656109abf055a20ec1
2017-07-05 20:43:58 +00:00
Android Build Merger (Role)
5daad21245 Merge "Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da" into oc-dr1-dev-plus-aosp 2017-07-05 20:42:57 +00:00
Daniel Nishi
33c0f8888b Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev
am: 37caf9c7da

Change-Id: I97bb447b0b2ce106bc87914bc2b10df6b7632a4c
2017-07-05 20:42:44 +00:00
Daniel Nishi
d7685ec8c8 Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev
am: 37caf9c7da

Change-Id: Ib2f37664e42035e72c0980ac3dc209e47585f95f
2017-07-05 20:42:29 +00:00
jackqdyulei
b067dea683 Merge "Update the method about foreground time." into oc-dr1-dev
am: 96e774b7d7

Change-Id: I4037f224cf5028abe5617775d394adfed1552b27
2017-07-05 20:42:10 +00:00
Daniel Nishi
37caf9c7da Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev 2017-07-05 20:40:41 +00:00
TreeHugger Robot
96e774b7d7 Merge "Update the method about foreground time." into oc-dr1-dev 2017-07-05 20:38:52 +00:00
Android Build Merger (Role)
95cc1f6829 Merge "Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev am: 3a9734261d am: 593049c1d4" 2017-07-05 20:30:51 +00:00
jackqdyulei
2a6abb5e80 Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev am: 3a9734261d
am: 593049c1d4

Change-Id: Idbdaad128672c06837730863ad2d71446b4642fa
2017-07-05 20:27:29 +00:00
jackqdyulei
6a4f234ec0 Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev am: 3a9734261d
am: 593049c1d4

Change-Id: I9912ab553f344a57d56de0660a6375becb992274
2017-07-05 20:26:39 +00:00
jackqdyulei
593049c1d4 Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev
am: 3a9734261d

Change-Id: I03c108b9a4712205906125ea12114e4ed6659255
2017-07-05 20:24:58 +00:00
TreeHugger Robot
3a9734261d Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev 2017-07-05 20:21:46 +00:00
Sundeep Ghuman
d569195299 Use EntityHeaderController in WifiDetailPreferenceController.
Switch to the Entity header to bring parity in design of
WifiNetworkDetailsFragment and other Settings pages.

Bug: b/37252029
Test: make -j40 RunSettingsRoboTests
Change-Id: Ib11f3d37eac4dca08fa61eef67910cd328682bac
2017-07-05 12:54:38 -07:00
Doris Ling
c7d2d270ab Ensure that brightness level is within 0-100%.
Check whether the retrieved brightnesss value is out of range, and
adjust it if necessary.

Change-Id: Ieb1ccc03dcb9fa3e1ed192fcc3d217b84d4d316c
Fix: 63181935
Test: make RunSettingsRoboTests
2017-07-05 12:53:04 -07:00
Stephen Chen
7e27006a7b Adjust UX for toggles when active scorer is not set.
This change fixes two issues: when wakeup is not available, update the
number of items to show above the fold in wifi preferences. When scorer
is not set, grey out wakeup toggle and set summary to reflect the
status.

Bug: 62410973
Bug: 62343859
Test: make RunSettingsRoboTests -j40

Change-Id: I5f4131c6a86eab6c0fb03ea2b5101ba107a9189f
2017-07-05 12:29:06 -07:00
Rajeev Kumar
ad157aca52 Create a feature provider for data plan feature. This change will
allow us to enable/disable this feature from adb shell.

Bug: 62349208
Test: make RunSettingsRoboTests -j40
Change-Id: I2d0bed738d5d4cd0fe1de056ee37092d46be72b6
2017-07-05 12:25:53 -07:00
Phil Weaver
633c9be21c Migrate to new overlay-stopping flag
Bug: 62196835
Test: Started an accessibility service that displays an app
overlay and verified that it disappears when approving an
accessibility service's capabilities.

Change-Id: I7c8d8b4143a5dd1cb684c31c4503608c8d5be0e3
2017-07-05 10:41:18 -07:00
TreeHugger Robot
f0398e1294 Merge "Add an activity that starts DataUsageList fragment for mobile." 2017-07-05 17:40:13 +00:00
phweiss
7a34e9c28e When Remove Account is disallowed, show dialog
When DISALLOW_MODIFY_ACCOUNT is set by a device admin, and
the user wants to remove an account, show the support dialog
instead of showing the confirm dialog.

To use the O-API DPM.createAdminSupportIntent(), a wrapper
needs to be used, because existing Robolectric tests otherwise
don't compile.

Bug: 37413849
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=*RemoveAccountPreferenceControllerTest

Change-Id: If23ea304ab8b9df1748e6acf3032310843b04780
2017-07-05 19:32:48 +02:00
Daniel Nishi
5d272ce4ff Unify storage calculations.
Due to one calculation using longs and the other using doubles, there
were situations where the percentage was off-by-one between the two
places.

By changing both places to now use doubles to calculate percentages, the
numbers should be unified.

Change-Id: I4f4ed19326562e198273adc60a1593c7d1a6b6a7
Fixes: 37923610
Test: Manual
2017-07-05 10:10:15 -07:00
Daniel Sheng
20d5588a27 Added suggestions for gestures.
Bug: 30986021
Test: manual + make RunSettingsRoboTests + adb shell am instrument -w
com.android.settings.tests.unit /android.support.test.runner.AndroidJUnitRunner

Change-Id: I7aed110c81ca2fb6b90e2f359b4bb941c02bc1c3
2017-07-05 09:05:11 -07:00
Charles He
d5612408af Merge "Disable incorrect strong auth prompt strings." into oc-dr1-dev am: c619ad77bb
am: 3ae7bacff4

Change-Id: I6c0e42bc214d68628e65ea2c90852b282f935690
2017-07-03 15:38:13 +00:00
Charles He
3ae7bacff4 Merge "Disable incorrect strong auth prompt strings." into oc-dr1-dev
am: c619ad77bb

Change-Id: I6d4e95b63896365308c8acaa07699d53560d64b4
2017-07-03 15:34:45 +00:00
Charles He
c619ad77bb Merge "Disable incorrect strong auth prompt strings." into oc-dr1-dev 2017-07-03 15:32:09 +00:00
Charles He
701ac5cbee Disable incorrect strong auth prompt strings.
The prompt strings on the confirm credentials screen (pin, password,
pattern) are incorrect. They currently say strong auth is "required
after device restarts". But instead they should be "required for
additional security" because strong auth can be enforced not only after
device or profile restarts, but also after profile key eviction, for
example.

Unfortunately, we've already missed the window for string changes.
Therefore, as an alternative, we use generic prompt strings in this CL,
to avoid conveying the incorrect (and misleading) information. We'll
follow up with another CL in master with a proper string change to fix
the issue.

Bug: 36511626
Test: manual
Test: make SettingsRoboTests
Change-Id: I44f84420b88bb4933ad0afa6e8032af465de0cd3
2017-07-03 09:42:20 +01:00
Bill Yi
10b7b9e943 Merge "Import translations. DO NOT MERGE am: 126ce95bc6 -s ours am: 07a57fc90b -s ours" into oc-dr1-dev-plus-aosp
am: a659760862  -s ours

Change-Id: I708b16b0e9daf87a9605107c7c4451eb67ebb189
2017-07-01 16:15:40 +00:00
Bill Yi
9ce196f540 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: aaeb09e6c7 -s ours
am: 8aa5c204f6  -s ours

Change-Id: I9d8859282a2b22e952e94b633f4745b991d06dd4
2017-07-01 16:15:17 +00:00
Bill Yi
a177e243e8 Import translations. DO NOT MERGE am: 126ce95bc6 -s ours am: 2626c36d29 -s ours
am: 44a5f4cece  -s ours

Change-Id: Ic89fcbaec13f3cee8012d005c99493eed9d6c7d9
2017-07-01 16:14:53 +00:00
Android Build Merger (Role)
a659760862 Merge "Import translations. DO NOT MERGE am: 126ce95bc6 -s ours am: 07a57fc90b -s ours" into oc-dr1-dev-plus-aosp 2017-07-01 16:10:18 +00:00
Bill Yi
6532f4c129 Import translations. DO NOT MERGE am: 126ce95bc6 -s ours
am: 07a57fc90b  -s ours

Change-Id: Ifbfb5d7e768115a0b2366d15c489da2b34d57ad4
2017-07-01 16:09:54 +00:00
Bill Yi
8aa5c204f6 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: aaeb09e6c7  -s ours

Change-Id: I2d839b0eae979a4a5c655427f57575006b9f0694
2017-07-01 16:09:53 +00:00
Bill Yi
44a5f4cece Import translations. DO NOT MERGE am: 126ce95bc6 -s ours
am: 2626c36d29  -s ours

Change-Id: Ia3d459b682083ce6b7897439748a2630a143e90e
2017-07-01 16:09:34 +00:00
TreeHugger Robot
aaeb09e6c7 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-07-01 16:06:05 +00:00
Bill Yi
07a57fc90b Import translations. DO NOT MERGE
am: 126ce95bc6  -s ours

Change-Id: I99cf4ac7ff9a9ae62df014c790a7af691e670cbc
2017-07-01 16:05:02 +00:00
Bill Yi
2626c36d29 Import translations. DO NOT MERGE
am: 126ce95bc6  -s ours

Change-Id: Iaa93cedcdc1089409ee0d01bad5edd932acbbcbb
2017-07-01 16:05:02 +00:00
Kevin Chyn
9fde3fe2ab Merge "Assist gesture setting should not be available on unsupported devices" into oc-dr1-dev am: 72a94e9f5a
am: 408efb26f0

Change-Id: I696511821f64f7bc09819cf1d45374125b7905c0
2017-07-01 03:11:52 +00:00
Kevin Chyn
408efb26f0 Merge "Assist gesture setting should not be available on unsupported devices" into oc-dr1-dev
am: 72a94e9f5a

Change-Id: I7748c0537a6eebb1fd460b3039a9a53dc070e19e
2017-07-01 03:06:52 +00:00
TreeHugger Robot
72a94e9f5a Merge "Assist gesture setting should not be available on unsupported devices" into oc-dr1-dev 2017-07-01 02:59:19 +00:00
Bill Yi
126ce95bc6 Import translations. DO NOT MERGE
Change-Id: Id991a5f419ccb85d8e25a5111b717a84e4de6184
Auto-generated-cl: translation import
2017-06-30 18:07:52 -07:00
TreeHugger Robot
d9f978af21 Merge "Code cleanup: DashboardAdapter.category is no longer a list" 2017-07-01 01:06:58 +00:00
Bill Yi
7df73c0524 Import translations. DO NOT MERGE
Change-Id: I67181f9f767d7edccf78f901ad70e903b123649f
Auto-generated-cl: translation import
2017-06-30 18:02:00 -07:00
Fan Zhang
63b43c082d Change permission preference to only 1 line summary am: 32a8568230
am: 33a91c5004

Change-Id: I2e32fe198008b05a779dbfc68fc5695fec10f8bb
2017-07-01 00:49:43 +00:00