Commit Graph

15051 Commits

Author SHA1 Message Date
jyhshiangwang
4d015b17b3 Use ListFormatter to join strings
Currently in Settings we are using R.string.join_many_items_first, R.string.join_many_items_middle and R.string.join_many_items_last to manually join strings. The join code is messy and the joined string is incorrect in some languages, so we migrate all string join to just use ListFormatter.getInstance().format().

Bug: b/78248791
Test: robotests
Change-Id: I898339978e6e2027587e28994b0280fa46821fd6
2018-05-02 11:15:32 +08:00
android-build-team Robot
7c45f59478 Merge "Update cellular data condition icon and padding." into pi-dev am: 1a38390728
am: 8907b93d07

Change-Id: I1f6c63ad8c8d3a3d020a7ece8fd540ac77427650
2018-05-01 17:24:43 -07:00
android-build-team Robot
8907b93d07 Merge "Update cellular data condition icon and padding." into pi-dev
am: 1a38390728

Change-Id: I2372af3d9e40cf3d0d4bcc1f13dffe6d856af18f
2018-05-01 17:17:41 -07:00
android-build-team Robot
1a38390728 Merge "Update cellular data condition icon and padding." into pi-dev 2018-05-02 00:08:11 +00:00
Fan Zhang
2b9f8c96d1 Update cellular data condition icon and padding.
Change-Id: I01fcdcc09a81758eb12e898aea5d64fa1dc6ef06
Fixes: 79090390
Test: visual
2018-05-01 15:27:01 -07:00
android-build-team Robot
a020cc9c0a Merge "Import translations. DO NOT MERGE" into pi-dev 2018-05-01 20:16:51 +00:00
Bill Yi
20473e54ab Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 78510764
Change-Id: I675f55ab20567796d3580e386fecc87d4f8c3d78
2018-05-01 18:50:02 +00:00
Julia Reynolds
5c19e7b6b0 Update zen onboarding ui am: 29ba3601b0
am: fa6482c4a4

Change-Id: I9010987409185d91ff039657cf2b20aeaefd01ad
2018-05-01 11:05:14 -07:00
Julia Reynolds
fa6482c4a4 Update zen onboarding ui
am: 29ba3601b0

Change-Id: I2c1769f683dd464c96e758b61bd5e47b4a538c44
2018-05-01 10:33:18 -07:00
Julia Reynolds
29ba3601b0 Update zen onboarding ui
Test: robotests
Bug: 78448988
Change-Id: I1e70bf8d28f392b93bb102622340da0af65f4718
2018-05-01 15:11:03 +00:00
android-build-team Robot
6451b7b91b Merge "Migrate PaymentSettings to DashboardFragment" 2018-05-01 01:37:34 +00:00
chiujason
ff244c0e40 Migrate PaymentSettings to DashboardFragment
- Move preference related logic to controllers.
- Add some test cases for controllers.

Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.nfc
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
      atest SettingsGatewayTest UniquePreferenceTest
Change-Id: I061a194c170f63fab51974f26c24be43d67d6f6f
2018-04-30 17:24:58 -07:00
android-build-team Robot
ecb74eb273 Merge "Update the color of security status icons" into pi-dev am: c883db167a
am: 07187fb9b9

Change-Id: I8d5476ee6673e253494a58d984b3196018b0f3ef
2018-04-30 17:03:49 -07:00
android-build-team Robot
07187fb9b9 Merge "Update the color of security status icons" into pi-dev
am: c883db167a

Change-Id: I738495f88c1655b0e3e479eb56812a670ab785f6
2018-04-30 16:54:02 -07:00
android-build-team Robot
c883db167a Merge "Update the color of security status icons" into pi-dev 2018-04-30 23:49:41 +00:00
Antony Sargent
779292bcde Update the color of security status icons
Also update res/drawable/ic_ota_update_none.xml to have the same
contents as res/drawable/ic_ota_update_stale.xml.

Bug: 74255242
Test: manual (go to Settings->Security & location; the icons in the
Security status section at the top should be colorful)

Change-Id: I1c54c5b6803268e3acf9720c7c555476405d624e
2018-04-30 15:11:19 -07:00
android-build-team Robot
bf9c07cb59 Merge "Revert "Get rid of charging sounds toggle"" into pi-dev am: 8e55299f98
am: 72cedc72a4

Change-Id: Ib15d341f90072be2fbe3d6b5cb1bfd9c4fcbb938
2018-04-30 14:29:58 -07:00
android-build-team Robot
72cedc72a4 Merge "Revert "Get rid of charging sounds toggle"" into pi-dev
am: 8e55299f98

Change-Id: I58e93b9c70d57224c01bd62fa47640badd1febaf
2018-04-30 14:22:42 -07:00
android-build-team Robot
8e55299f98 Merge "Revert "Get rid of charging sounds toggle"" into pi-dev 2018-04-30 21:08:51 +00:00
Beverly Tai
6761acdd33 Revert "Get rid of charging sounds toggle"
Bug: 77912907
This reverts commit fbe721b1b3.

Reason for revert: negative dogfood feedback

Change-Id: I8485a379eafee0a4fcd599e9b1c47aee7dd3c6ad
2018-04-30 20:01:40 +00:00
hjchangliao
47f1d006c8 Update Conditional padding to align Suggestions
Reduce start/end padding of Conditional card,
to align Suggestions.

Change-Id: I333bfb848df27e7132d3e26953580de21ea235d3
Fixes: 78660126
Test: Manual test
2018-04-30 11:42:56 +08:00
android-build-team Robot
167612df0e Merge "Migrate ChooseAccountActivity to DashboardFragment" 2018-04-28 06:10:25 +00:00
Emily Chuang
b279b1c025 Migrate ChooseAccountActivity to DashboardFragment
- Build a controller to generate/manage a list of preferences.
- Move some logics to the controller and add tests.
- Rename to ChooseAccountFragment.

Bug: 73899467
Test: make RunSettingsRoboTests -j
      atest UniquePreferenceTest SettingsGatewayTest
Change-Id: Id2906c4b922ef159d08c803b976671264c54665f
2018-04-27 22:17:23 -07:00
android-build-team Robot
5424a8ec48 Merge "Updated play button icon for paused animations" into pi-dev am: 0929651a77
am: 022fcde73d

Change-Id: I8e2b631bf2699a88fe163b2fea5699c892f3f184
2018-04-27 15:58:25 -07:00
android-build-team Robot
022fcde73d Merge "Updated play button icon for paused animations" into pi-dev
am: 0929651a77

Change-Id: I02c0842e2eb135e87a941b34a364341e9128924a
2018-04-27 15:54:21 -07:00
android-build-team Robot
0929651a77 Merge "Updated play button icon for paused animations" into pi-dev 2018-04-27 22:47:29 +00:00
android-build-team Robot
656374349d Merge "mark feature flag translateble to avoid loc bugs." 2018-04-27 21:26:18 +00:00
android-build-team Robot
6161be4d40 Merge "Add tint attribute to the icon" into pi-dev am: 98496a5683
am: 8e7b570142

Change-Id: Ic1ba08683aa90ca8289d38608dc8d398f0955689
2018-04-27 10:03:36 -07:00
android-build-team Robot
8e7b570142 Merge "Add tint attribute to the icon" into pi-dev
am: 98496a5683

Change-Id: Ic69e73f1847637cf7913e03696e6823840bbcb38
2018-04-27 09:59:24 -07:00
android-build-team Robot
98496a5683 Merge "Add tint attribute to the icon" into pi-dev 2018-04-27 16:55:06 +00:00
Julia Reynolds
207d0bbe76 Merge "Redesign zen visual effects screens" into pi-dev
am: ea360d687d

Change-Id: I416a1265f129825d91475ba63c30f02ec37adb52
2018-04-27 05:48:26 -07:00
Julia Reynolds
ea360d687d Merge "Redesign zen visual effects screens" into pi-dev 2018-04-27 12:41:58 +00:00
Julia Reynolds
4cf8bfd5b2 Redesign zen visual effects screens
Test: robotests
Bug: 78448988
Change-Id: I3040c1103d76c75601e82e3660a2ace202837ec2
Merged-In: I3040c1103d76c75601e82e3660a2ace202837ec2
2018-04-27 11:12:34 +00:00
Julia Reynolds
302b27ab9a Merge "Redesign zen visual effects screens" 2018-04-27 11:08:57 +00:00
Cyril Lee
1590ce33e8 Merge "Change fingerprint enrolling animation to 4 colors" into pi-dev am: 66640d6412
am: 7691959d04

Change-Id: I517a30099c8f28ddbc6ab04bf6a94a339505c9f3
2018-04-26 20:08:01 -07:00
Cyril Lee
7691959d04 Merge "Change fingerprint enrolling animation to 4 colors" into pi-dev
am: 66640d6412

Change-Id: I781b47a12226b7ef93ee7bf6edcc43554e6a32bf
2018-04-26 20:00:20 -07:00
Cyril Lee
66640d6412 Merge "Change fingerprint enrolling animation to 4 colors" into pi-dev 2018-04-27 02:53:30 +00:00
Sam.SH Chang
ade2423e34 Add tint attribute to the icon
Bug: 78238313
Test: build pass
Change-Id: I805f5a8f1c21f617d3555e135e9d332b77ca0c29
2018-04-27 10:32:27 +08:00
TreeHugger Robot
0e6977da39 Merge "Slices feature supports firmware version." 2018-04-27 01:10:09 +00:00
Fan Zhang
1b6835a86b mark feature flag translateble to avoid loc bugs.
Change-Id: I8a5c1e5ce6afbcfb784524a15ad69966ea28b532
Fixes: 78503763
Test: builds
2018-04-27 00:37:13 +00:00
tmfang
1f37d190c0 Slices feature supports firmware version.
- Migrate FirmwareVersionPreferenceController to BasePreferenceController class.
- Because slices feature needs an unique uri,
  we should avoid same firmware key in my_device_info.xml and device_info_settings.xml.
- Modify test case for new firmware version controller.

Test: slice uri > content://android.settings.slices/intent/my_device_firmware_version
Test: make RunSettingsRoboTests -j
      atest UniquePreferenceTest SettingsGatewayTest
Change-Id: If516bbdb3ddb823db9909123ef694a2beaf5dc66
2018-04-26 15:22:01 -07:00
Jason Monk
0d3322a57b Merge "Push full slice index to device index" into pi-dev am: 3d29ca2893
am: 2332aad2a6

Change-Id: I3563eb7ed2ab93b35b1a950d89ca2466abaa59e3
2018-04-26 14:26:38 -07:00
Jason Monk
2332aad2a6 Merge "Push full slice index to device index" into pi-dev
am: 3d29ca2893

Change-Id: I51d4b2d8a271460215f0d489a372932fca5b3d8b
2018-04-26 14:08:36 -07:00
Jason Monk
3d29ca2893 Merge "Push full slice index to device index" into pi-dev 2018-04-26 20:48:41 +00:00
Antony Sargent
86e6366f61 Updated play button icon for paused animations
The current play button is mostly white and hard to see with the new
animation videos. This updates it to one which has more blue to stand
out better.

Fixes: 78306799
Test: manual (while watching one of the animations at Settings -> System
-> Gestures; tap the video to pause)
Change-Id: I48deb6c35eccb3ecd21f2aa6dcc3d275c7436f47
2018-04-26 13:46:45 -07:00
Fan Zhang
117c0fb6e6 Merge "InputMethodAndSubtypeEnabler use DashboardFragment" 2018-04-26 19:12:11 +00:00
Julia Reynolds
4aa42fed67 Redesign zen visual effects screens
Test: robotests
Bug: 78448988
Change-Id: I3040c1103d76c75601e82e3660a2ace202837ec2
2018-04-26 18:12:38 +00:00
Jan Nordqvist
7b0651b63f Merge "Hiding data remaining text when available space is too small." into pi-dev
am: 5f6937dd88

Change-Id: I26b52aa76c4eab8e5240efae826debc74cb73e3e
2018-04-26 10:48:03 -07:00
TreeHugger Robot
5f6937dd88 Merge "Hiding data remaining text when available space is too small." into pi-dev 2018-04-26 17:33:53 +00:00
Sean Callanan
b2218a3071 Merge "Settings: update color mode preview to final content" into pi-dev am: 9b08ed63e9
am: 7187243565

Change-Id: I49aefbb3c01760977e07535dc305921ceb548b6b
2018-04-26 10:20:45 -07:00