Commit Graph

12755 Commits

Author SHA1 Message Date
Lei Yu
080950bed9 Merge "Extend char limit for dialog title" into oc-dr1-dev am: 241fecbd79
am: 8a954ee7a6

Change-Id: Ieb4bc97b45ec9deaf5f5bb0c585c17bdc5ce3cf8
2017-07-13 22:04:26 +00:00
Lei Yu
8a954ee7a6 Merge "Extend char limit for dialog title" into oc-dr1-dev
am: 241fecbd79

Change-Id: Icfc611300d9f4b0b1b95291fac950ed0924dbbf2
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
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
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

Change-Id: I92846eec6bcbb67862b8ad1cf6447623a2dc3ab0
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
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
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
TreeHugger Robot
a2070f9a4f Merge "UI refresh on bluetooth list page" 2017-07-12 23:05:58 +00:00
jackqdyulei
176c5855f2 update the string for bt disable
Bug: 36665551
Test: Screenshot
Change-Id: I0c7f8169a1328d42d952ad85b81cfd20e3ee0f04
2017-07-12 16:01:09 -07: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
Rajeev Kumar
82ee7cf14f Merge "Data plans setting peference." 2017-07-12 20:53:52 +00:00
Fan Zhang
f57e167375 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

Change-Id: I6e9764dbb6c51f94be6d6a61d5a6401141407409
Bug: 62890841
Bug: 62891178
Test: robotests
2017-07-12 13:24:25 -07:00
Ajay Nadathur
7d66e044d4 Merge "Remove next button from FingerprintEnroll screen" into oc-dr1-dev am: d1bac25518
am: 4aaa52d1d6

Change-Id: Ib8d8d766bccd6ce1d91ecdb752fc2581edb50898
2017-07-12 20:09:22 +00:00
Ajay Nadathur
4aaa52d1d6 Merge "Remove next button from FingerprintEnroll screen" into oc-dr1-dev
am: d1bac25518

Change-Id: Ib5269308dfd159b0bf535421ae9bc65628aee3e6
2017-07-12 20:07:19 +00:00
TreeHugger Robot
d1bac25518 Merge "Remove next button from FingerprintEnroll screen" into oc-dr1-dev 2017-07-12 20:03:14 +00:00
Rajeev Kumar
c6f0b9d6f3 Data plans setting peference.
Change-Id: Ieb2aa67ab98140aa90501227345a15ad64cf124c
Note: These changes are required for Data balance UI.
Bug: 62349208
Test: make RunSettingsRoboTests -j40
2017-07-12 11:48:23 -07:00
Doris Ling
a674aa69c2 Merge "Update spacing and background color for condition/suggestion." into oc-dr1-dev
am: 91ca9f60e9

Change-Id: I65e88eb8e4d65641beace03ab8f0782efa00db62
2017-07-12 03:13:51 +00:00
TreeHugger Robot
91ca9f60e9 Merge "Update spacing and background color for condition/suggestion." into oc-dr1-dev 2017-07-12 02:58:28 +00:00
Ajay Nadathur
85132ee541 Merge "Add another fingerprint button not visible in landscape mode" into oc-dr1-dev am: 482b7feaa7
am: 43a49fca4d

Change-Id: I952294bb784d35534b5c1d757141aad3260e650b
2017-07-12 02:09:29 +00:00
Ajay Nadathur
43a49fca4d Merge "Add another fingerprint button not visible in landscape mode" into oc-dr1-dev
am: 482b7feaa7

Change-Id: I662ed360a3fa3031679ad91cb3280893694b60bd
2017-07-12 02:05:58 +00:00
TreeHugger Robot
482b7feaa7 Merge "Add another fingerprint button not visible in landscape mode" into oc-dr1-dev 2017-07-12 01:57:26 +00:00
Ajay Nadathur
ba313c0347 Remove next button from FingerprintEnroll screen
bug: 63515466
Test: Manually tested and verified that next button is removed
Change-Id: Ib43363c763fba2f92cb4774e1b961ab8647f5040
2017-07-11 18:49:53 -07:00
TreeHugger Robot
30e0986078 Merge "Update spacing and background color for condition/suggestion." 2017-07-12 00:25:13 +00:00
Ajay Nadathur
5eca3a64ea Add another fingerprint button not visible in landscape mode
bug:63067568
Test: Manually tested and verified
Change-Id: I172bbf4c4db6cebb2cc96874f3d8d29e859b07d1
2017-07-11 16:58:12 -07:00
Doris Ling
df055c8655 Update spacing and background color for condition/suggestion.
- changed suggestion/condition and searchbox background color to
  #F2F2F2
- changed condition card background color to #F8F8F8
- removed Suggestion header
- reduced space above condition header/footer by 9dp

Fix: 63393599
Test: visual
Change-Id: I4317781c93e23c6d019928b9fe9af16177f81c07
Merged-In: I268934e3a573b542480c0b21dbab68b7217295b5
2017-07-11 15:50:48 -07:00
Kevin Chyn
1e21688600 Merge "Assist gesture title should not be translated, remove unused strings" into oc-dr1-dev am: 7bde506ed1
am: bab6e592bc

Change-Id: I2e4fd1b07be1de6565dd2842211392d8f6cb3e36
2017-07-11 22:40:16 +00:00
Kevin Chyn
bab6e592bc Merge "Assist gesture title should not be translated, remove unused strings" into oc-dr1-dev
am: 7bde506ed1

Change-Id: I638df735c2716cc243a471687d176be6613e8bce
2017-07-11 22:36:47 +00:00
TreeHugger Robot
7bde506ed1 Merge "Assist gesture title should not be translated, remove unused strings" into oc-dr1-dev 2017-07-11 22:32:19 +00:00
Doris Ling
78e08f0f0a Update spacing and background color for condition/suggestion.
- changed suggestion/condition and searchbox background color to
  #F2F2F2
- changed condition card background color to #F8F8F8
- removed Suggestion header
- reduced space above condition header/footer by 9dp

Bug: 63393599
Test: make RunSettingsRoboTests
Change-Id: I268934e3a573b542480c0b21dbab68b7217295b5
2017-07-11 15:22:53 -07:00
Stephen Chen
e549e732bd Merge "Adjust UX for toggles when active scorer is not set." into oc-dr1-dev
am: 89fdea9807

Change-Id: Iddc9c6e474847f2aa54a0f695d34201a84596985
2017-07-11 20:27:39 +00:00
TreeHugger Robot
89fdea9807 Merge "Adjust UX for toggles when active scorer is not set." into oc-dr1-dev 2017-07-11 20:21:01 +00:00
Kevin Chyn
599d4b93f3 Assist gesture title should not be translated, remove unused strings
Bug: 63441962

Test: manual && make -j RunSettingsRoboTests
Change-Id: I8b50ad378828f30f31dbfd648c9fac62af5d9da7
2017-07-11 13:17:37 -07:00
Fan Zhang
a30c941361 Merge "Use preference theme from SettingsLib" 2017-07-11 19:20:59 +00:00
Rajeev Kumar
ff3834f4d4 Merge "Add custom attributes to DonutView." 2017-07-11 19:02:17 +00:00
Rajeev Kumar
eaceb1906e Add custom attributes to DonutView.
Note: These changes are required for Data balance UI.
Bug: 62349208
Test: Manual
Change-Id: I50f304580f681dc1461fb82d84ce0fede21b4b87
2017-07-11 10:32:27 -07:00
TreeHugger Robot
70a48e66eb Merge "Use a grey shade under progress spinner in wifi settings" 2017-07-11 17:24:43 +00:00
TreeHugger Robot
740405a044 Merge "Add special lock screen prompt strings for strong auth." 2017-07-11 12:04:38 +00:00
Charles He
4c96d9b203 Add special lock screen prompt strings for strong auth.
Due to incorrect strings, we temporarily disabled the prompt strings for
strong auth and instead used the generic ones as a short-term fix. In
this CL, we correct the strong auth prompt strings and add them back to
the lock screen UI. The new strings are in line with those in keyguard.

Bug: 36511626
Test: manual
Test: make RunSettingsRoboTests
Change-Id: Ifba689db37cc7d331eb1a774814f6b6235977ff9
2017-07-11 10:49:59 +01:00
TreeHugger Robot
75bcd075f2 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-07-11 04:01:24 +00:00
Kevin Chyn
c10561bda2 Merge "Remove unnecessary keywords" into oc-dr1-dev am: 9cf03c3884
am: b5b7ef69bf

Change-Id: I8abf3025eb9b08283b19af3caba6100c46957ae0
2017-07-11 03:37:34 +00:00
Kevin Chyn
b5b7ef69bf Merge "Remove unnecessary keywords" into oc-dr1-dev
am: 9cf03c3884

Change-Id: I71026b6b9fa79608afd466cfce56e4be203c610d
2017-07-11 03:35:06 +00:00
TreeHugger Robot
9cf03c3884 Merge "Remove unnecessary keywords" into oc-dr1-dev 2017-07-11 03:31:06 +00:00
Kevin Chyn
dde95f663a Remove unnecessary keywords
Fixes: 63544783

Test: make -j RunSettingsRoboTests && manual
Change-Id: I6f6cb8aff365174edb7cd22f18cbc1b7e7ba5b4a
2017-07-11 03:23:21 +00:00
TreeHugger Robot
cd3e5bf6c8 Merge "Search cleanu-np: remove useless summary from some settings" 2017-07-11 00:25:50 +00:00
TreeHugger Robot
ce9e90a740 Merge "Entity header layout cleanup" 2017-07-11 00:21:41 +00:00