Rajeev Kumar
c57fa7f90c
Merge "Data plans sync time settings preference."
2017-07-14 01:58:46 +00:00
Jeff Davidson
0c716a748a
Merge "Don't show "Wipe eSIMs" checkbox for developers." into oc-dr1-dev am: 98f83d6129
...
am: 1b1e9928ab
2017-07-14 01:11:41 +00:00
Jeff Davidson
1b1e9928ab
Merge "Don't show "Wipe eSIMs" checkbox for developers." into oc-dr1-dev
...
am: 98f83d6129
2017-07-14 01:09:09 +00:00
TreeHugger Robot
98f83d6129
Merge "Don't show "Wipe eSIMs" checkbox for developers." into oc-dr1-dev
2017-07-14 01:02:07 +00:00
Rajeev Kumar
a8ba46b355
Data plans sync time settings preference.
...
Note: These changes are required for Data balance UI.
Bug: 62349208
Test: make RunSettingsRoboTests -j40
Change-Id: Id52789f2a96dea5ff8c29699ac6fab79e3c5d1bf
2017-07-13 16:11:59 -07:00
TreeHugger Robot
7eee73a0c8
Merge "Don't use framework strings for formatting file sizes"
2017-07-13 23:11:42 +00:00
Rajeev Kumar
bb90de3a4c
Merge "Manage data plans settings preference."
2017-07-13 22:59:01 +00:00
Fan Zhang
a7b04ed692
Merge "Show default app icon in default app screen."
2017-07-13 22:41:16 +00:00
TreeHugger Robot
b852f6de93
Merge "Bidi wrap ip address in Wifi config settings"
2017-07-13 22:19:25 +00:00
Lei Yu
080950bed9
Merge "Extend char limit for dialog title" into oc-dr1-dev am: 241fecbd79
...
am: 8a954ee7a6
2017-07-13 22:04:26 +00:00
Lei Yu
8a954ee7a6
Merge "Extend char limit for dialog title" into oc-dr1-dev
...
am: 241fecbd79
2017-07-13 21:49:11 +00:00
Lei Yu
241fecbd79
Merge "Extend char limit for dialog title" into oc-dr1-dev
2017-07-13 21:33:27 +00:00
Doris Ling
36c1934162
Merge "Fix mokey crash on swiping settings condition." into oc-dr1-dev am: a7f5953a02
...
am: be7044845d
2017-07-13 21:28:54 +00:00
Doris Ling
be7044845d
Merge "Fix mokey crash on swiping settings condition." into oc-dr1-dev
...
am: a7f5953a02
2017-07-13 21:23:54 +00:00
TreeHugger Robot
a7f5953a02
Merge "Fix mokey crash on swiping settings condition." into oc-dr1-dev
2017-07-13 21:14:45 +00:00
TreeHugger Robot
cbedc3f0aa
Merge "Fix failing user settings test cases."
2017-07-13 20:59:24 +00:00
Rajeev Kumar
36a808a81e
Manage data plans settings preference.
...
Change-Id: I4e15921e793c8c336325e14bec8638d5f71dae17
Note: These changes are required for Data balance UI.
Bug: 62349208
Test: make RunSettingsRoboTests -j40
2017-07-13 13:56:01 -07:00
Fan Zhang
2ea6700336
Show default app icon in default app screen.
...
- Renamed AdvancedAppSettings to DefaultAppSettings.
- Add logic to DefaultAppPreferenceController to also display icon.
- Modified DefautlAssistPrefController to suppress gear icon, and use
the controller in default app setting UI to display icon.
- Remove dynamic injected payment setting activity and create the
setting statically in xml.
- Add DefaultPaymentSettingsPreference to display default payment app
title (no icon because we can't get it)
Change-Id: I6b8c768da0bafe5ec9a85ba9c79c7993b449be25
Fix: 36458534
Test: robotests
2017-07-13 13:49:28 -07:00
Fan Zhang
538c1347bf
Merge "UI refresh on bluetooth list page" into oc-dr1-dev am: c0ca084622
...
am: 303c330068
2017-07-13 20:37:02 +00:00
Fan Zhang
0d8ae943d2
Bidi wrap ip address in Wifi config settings
...
Change-Id: Ic1b8a61dbb05abd71170a0b98e7d1b8e604bbdcb
Fix: 63670324
Test: robotests
2017-07-13 13:19:29 -07:00
Fan Zhang
303c330068
Merge "UI refresh on bluetooth list page" into oc-dr1-dev
...
am: c0ca084622
2017-07-13 20:17:28 +00:00
TreeHugger Robot
c0ca084622
Merge "UI refresh on bluetooth list page" into oc-dr1-dev
2017-07-13 20:05:25 +00:00
Antony Sargent
27afdf0c26
Merge "Make sure PIN edit control is focused" into oc-dr1-dev am: 61e61d96d1
...
am: d1b5116213
2017-07-13 20:00:37 +00:00
Antony Sargent
d1b5116213
Merge "Make sure PIN edit control is focused" into oc-dr1-dev
...
am: 61e61d96d1
2017-07-13 19:54:27 +00:00
TreeHugger Robot
61e61d96d1
Merge "Make sure PIN edit control is focused" into oc-dr1-dev
2017-07-13 19:41:01 +00:00
Bill Yi
c7c0cfc1ec
Import translations. DO NOT MERGE am: 76a81a9803 -s ours
...
am: cc6a61a958
2017-07-13 19:04:42 +00:00
Doris Ling
83327ec2ab
Fix failing user settings test cases.
...
Update preference text to match latest label.
Change-Id: I3de544bea99c193507ee3b1451dd3c67049af07c
Fix: 63665308
Test: make SettingsTests
2017-07-13 12:03:08 -07:00
Bill Yi
cc6a61a958
Import translations. DO NOT MERGE
...
am: 76a81a9803
2017-07-13 18:54:57 +00:00
Fan Zhang
7b9568c10d
UI refresh on bluetooth list page
...
- xml layout clean up
- add "Device name" preference, tapping will bring up rename dialog
- Remove tap target from original device_name pref
Merged-In: I6e9764dbb6c51f94be6d6a61d5a6401141407409
Change-Id: I9cb67cc557a9b932d7cf795a8d4a6fb5215c4365
Fix: 62890841
Fix: 62891178
Test: robotests
2017-07-13 11:08:18 -07:00
Doris Ling
84c7739986
Fix mokey crash on swiping settings condition.
...
When the condition card is being swiped, add null check for the
retrieved Condition to ensure it is still valid before trying to
dismiss it.
Change-Id: I265091a5fe290e359fa9a6e16b1d87c03894c1b8
Fix: 63624859
Test: make RunSettingsRoboTests
2017-07-13 11:00:29 -07:00
jackqdyulei
a5084d35dc
Extend char limit for dialog title
...
Bug: 63396701
Test: Build
Change-Id: I6f873e42c52e66bab54de087ac7a478a9d6ce4f9
2017-07-13 10:25:39 -07:00
Bill Yi
76a81a9803
Import translations. DO NOT MERGE
...
Change-Id: Id689260565e4f98a7f6b4aa08668e5b102d28b1e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-13 07:56:00 -07:00
Bill Yi
7adc541aca
Import translations. DO NOT MERGE
...
Change-Id: I37194325f1fdfff4d6706c2b5bc5b2447f1c5e29
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-13 07:43:29 -07:00
Antony Sargent
4d7df06eb4
Make sure PIN edit control is focused
...
When doing Bluetooth pairing and the dialog reqesting a PIN comes up, we
want the PIN field to be focused and the keyboard to be shown. This fixes
a regression from N.
Bug: 62857671
Test: make RunSettingsRoboTests
Change-Id: I00dabfda737b6ac61b50518e11f21e5f9a5a1be1
2017-07-12 17:34:36 -07:00
Phil Weaver
84040fdb8b
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad -s ours am: e9d2bdc380 am: 8bf67896d6 am: 254bbe84a3 am: 8870bd7c5a am: 23a6d1d953 -s ours am: 9e63322457 am: c7b3f1f905
...
am: 81c87862db
2017-07-12 23:35:03 +00:00
Phil Weaver
ce17970f6d
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad -s ours am: e9d2bdc380 am: 8bf67896d6 am: 254bbe84a3 am: 8870bd7c5a am: 23a6d1d953 -s ours am: 9e63322457 am: 3393f0ff26
...
am: f23fdd0ac7
2017-07-12 23:31:33 +00:00
Phil Weaver
81c87862db
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad -s ours am: e9d2bdc380 am: 8bf67896d6 am: 254bbe84a3 am: 8870bd7c5a am: 23a6d1d953 -s ours am: 9e63322457
...
am: c7b3f1f905
2017-07-12 23:30:24 +00:00
Phil Weaver
f23fdd0ac7
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad -s ours am: e9d2bdc380 am: 8bf67896d6 am: 254bbe84a3 am: 8870bd7c5a am: 23a6d1d953 -s ours am: 9e63322457
...
am: 3393f0ff26
2017-07-12 23:29:06 +00:00
Phil Weaver
c7b3f1f905
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad -s ours am: e9d2bdc380 am: 8bf67896d6 am: 254bbe84a3 am: 8870bd7c5a am: 23a6d1d953 -s ours
...
am: 9e63322457
2017-07-12 23:22:23 +00:00
Phil Weaver
3393f0ff26
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad -s ours am: e9d2bdc380 am: 8bf67896d6 am: 254bbe84a3 am: 8870bd7c5a am: 23a6d1d953 -s ours
...
am: 9e63322457
2017-07-12 23:22:21 +00:00
Phil Weaver
9e63322457
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad -s ours am: e9d2bdc380 am: 8bf67896d6 am: 254bbe84a3 am: 8870bd7c5a
...
am: 23a6d1d953
2017-07-12 23:15:51 +00:00
Phil Weaver
23a6d1d953
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad -s ours am: e9d2bdc380 am: 8bf67896d6 am: 254bbe84a3
...
am: 8870bd7c5a
2017-07-12 23:08:49 +00:00
TreeHugger Robot
a2070f9a4f
Merge "UI refresh on bluetooth list page"
2017-07-12 23:05:58 +00:00
Phil Weaver
8870bd7c5a
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad -s ours am: e9d2bdc380 am: 8bf67896d6
...
am: 254bbe84a3
2017-07-12 23:02:11 +00:00
Roozbeh Pournader
ded99003c4
Don't use framework strings for formatting file sizes
...
Modify various formatters to avoid using framework strings for
formatting file sizes.
Also update README instructions for running unit tests.
Bug: 36994779
Test: adb shell am instrument -w -e class com.android.settings.utils.FileSizeFormatterTest com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Test: make -j RunSettingsRoboTests
Change-Id: I4035f26d29408b64389892a4a2379b4823f8ac96
2017-07-12 15:58:21 -07:00
Phil Weaver
254bbe84a3
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad -s ours am: e9d2bdc380
...
am: 8bf67896d6
2017-07-12 22:56:17 +00:00
Phil Weaver
8bf67896d6
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad -s ours
...
am: e9d2bdc380
2017-07-12 22:50:05 +00:00
Phil Weaver
e9d2bdc380
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c
...
am: 24aaf4d7ad
2017-07-12 22:41:40 +00:00
Phil Weaver
24aaf4d7ad
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9 am: 4a40ef7688
...
am: a486c82d9c
2017-07-12 22:35:43 +00:00
Phil Weaver
a486c82d9c
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours am: bb12830bf9
...
am: 4a40ef7688
2017-07-12 22:29:09 +00:00
