OSDN Git Service

android-x86/packages-apps-Settings.git
8 years agoMerge \"Add padding for the animation in the gestures settings.\" into nyc-mr1-dev
Doris Ling [Thu, 7 Jul 2016 17:11:12 +0000 (17:11 +0000)]
Merge \"Add padding for the animation in the gestures settings.\" into nyc-mr1-dev
am: 1b41dd7f8c

Change-Id: I047b71720315408c432b1bd4d430b1724ea48536

8 years agoMerge "Add padding for the animation in the gestures settings." into nyc-mr1-dev
Doris Ling [Thu, 7 Jul 2016 16:58:40 +0000 (16:58 +0000)]
Merge "Add padding for the animation in the gestures settings." into nyc-mr1-dev

8 years agoFix strings for support tab.
Fan Zhang [Thu, 7 Jul 2016 15:37:23 +0000 (15:37 +0000)]
Fix strings for support tab.
am: 4178710f3d

Change-Id: Iaf5c0945180fab00986827f03dd1bdf9b4c224eb

8 years agoFix strings for support tab.
Fan Zhang [Thu, 7 Jul 2016 00:07:37 +0000 (17:07 -0700)]
Fix strings for support tab.

Bug: 29105266

- Fix typos in string and comments
- Use 2 different strings for off-hour and off-line cases.

Change-Id: I63859605ff7185d5f8cc66fd31b56f1d09ed11aa

8 years agoMerge \"Use phone number as summary for \'About Phone\'.\" into nyc-mr1-dev
Fan Zhang [Thu, 7 Jul 2016 00:20:59 +0000 (00:20 +0000)]
Merge \"Use phone number as summary for \'About Phone\'.\" into nyc-mr1-dev
am: 071f62954d

Change-Id: I74ff5bbbe078f450769fcfc8f36bddb221daca69

8 years agoMerge "Use phone number as summary for 'About Phone'." into nyc-mr1-dev
TreeHugger Robot [Thu, 7 Jul 2016 00:14:07 +0000 (00:14 +0000)]
Merge "Use phone number as summary for 'About Phone'." into nyc-mr1-dev

8 years agoUse phone number as summary for 'About Phone'.
Fan Zhang [Wed, 6 Jul 2016 19:17:54 +0000 (12:17 -0700)]
Use phone number as summary for 'About Phone'.

Bug: 28419411
Change-Id: I3ac57a770bf4d7416459dadedf91c3d6cefbc6b4

8 years agoMerge \"Fix layout transition from Display->Ambient Display to Gestures\" into nyc...
Doris Ling [Wed, 6 Jul 2016 22:20:07 +0000 (22:20 +0000)]
Merge \"Fix layout transition from Display->Ambient Display to Gestures\" into nyc-mr1-dev
am: 3633058181

Change-Id: I75ed59bcdb3cf2382b8bc6fb9eb99f280fc1df72

8 years agoMerge "Fix layout transition from Display->Ambient Display to Gestures" into nyc...
Doris Ling [Wed, 6 Jul 2016 22:08:08 +0000 (22:08 +0000)]
Merge "Fix layout transition from Display->Ambient Display to Gestures" into nyc-mr1-dev

8 years agoAdd padding for the animation in the gestures settings.
Doris Ling [Wed, 6 Jul 2016 21:59:33 +0000 (14:59 -0700)]
Add padding for the animation in the gestures settings.

Add padding around the animation video in landscape mode to make it look
more proportional.

Bug: 29792743
Change-Id: I52cfcecd680a118741d8ced18afd9fc811a33d94

8 years agoMerge \"Add logging when click tollfree/tolled phone support button\" into nyc-mr1-dev
Fan Zhang [Wed, 6 Jul 2016 20:56:03 +0000 (20:56 +0000)]
Merge \"Add logging when click tollfree/tolled phone support button\" into nyc-mr1-dev
am: a0eb2997a9

Change-Id: I7a0d7e8cf410e05e578690b6ece69d6489fb3d81

8 years agoMerge "Add logging when click tollfree/tolled phone support button" into nyc-mr1-dev
TreeHugger Robot [Wed, 6 Jul 2016 20:44:04 +0000 (20:44 +0000)]
Merge "Add logging when click tollfree/tolled phone support button" into nyc-mr1-dev

8 years agoresolve merge conflicts of 9968f7a to nyc-mr1-dev-plus-aosp
Fan Zhang [Wed, 6 Jul 2016 20:28:19 +0000 (13:28 -0700)]
resolve merge conflicts of 9968f7a to nyc-mr1-dev-plus-aosp

Change-Id: Ic9a3884cc8bd08eea22d7d83660419ac84555e83

8 years agoFix layout transition from Display->Ambient Display to Gestures
Doris Ling [Fri, 1 Jul 2016 01:58:40 +0000 (18:58 -0700)]
Fix layout transition from Display->Ambient Display to Gestures

1. Add handling in Gestures settings to scroll to the corresponding
preference when launching from Display->Ambient Display
2. Remove the bitmap creation for the video preview image
3. Use a custom aspect ration framee layout to hold the animation
instead to avoid resizing of the animation view.

Bug: 29795707
Change-Id: I67209ba2508a93da4fc46ff20986309dbe5a83d5

8 years agoMerge \"Remove search in support tab.\" into nyc-mr1-dev
Fan Zhang [Wed, 6 Jul 2016 20:14:46 +0000 (20:14 +0000)]
Merge \"Remove search in support tab.\" into nyc-mr1-dev
am: bae81b4a6f

Change-Id: I59e7b9dffd8c488397b6904928e6c56a4ad0664d

8 years agoMerge "Show 'up arrow' in About phone->Status menu." into nyc-mr1-dev
TreeHugger Robot [Wed, 6 Jul 2016 20:09:43 +0000 (20:09 +0000)]
Merge "Show 'up arrow' in About phone->Status menu." into nyc-mr1-dev

8 years agoMerge "Remove search in support tab." into nyc-mr1-dev
Fan Zhang [Wed, 6 Jul 2016 20:09:10 +0000 (20:09 +0000)]
Merge "Remove search in support tab." into nyc-mr1-dev

8 years agoImport translations. DO NOT MERGE am: 271f042229 -s ours
Bill Yi [Wed, 6 Jul 2016 18:32:41 +0000 (18:32 +0000)]
Import translations. DO NOT MERGE am: 271f042229  -s ours
am: d2a702e82f  -s ours

Change-Id: I0f93fc30e59e41f59048b491fd784eb154c3d924

8 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 6 Jul 2016 18:25:17 +0000 (18:25 +0000)]
Import translations. DO NOT MERGE
am: 271f042229  -s ours

Change-Id: Ia494efe0469c9877dc7730c9a57d9be8ea9e30a9

8 years agoRemove search in support tab.
Fan Zhang [Thu, 30 Jun 2016 20:20:12 +0000 (13:20 -0700)]
Remove search in support tab.

Bug: 29397123
Change-Id: Id2d43724696c04e890adba562b5476e1834779da

8 years agoMerge \"Don\'t show always-on option connecting PPTP vpn\" into nyc-mr1-dev
Robin Lee [Wed, 6 Jul 2016 10:35:11 +0000 (10:35 +0000)]
Merge \"Don\'t show always-on option connecting PPTP vpn\" into nyc-mr1-dev
am: 1926ed9f83

Change-Id: I98de935857099b26946a66a884908cdcf470e11a

8 years agoMerge "Don't show always-on option connecting PPTP vpn" into nyc-mr1-dev
Robin Lee [Wed, 6 Jul 2016 10:30:12 +0000 (10:30 +0000)]
Merge "Don't show always-on option connecting PPTP vpn" into nyc-mr1-dev

8 years agoMerge \"Show info icon when RestrictedListPreference is disabled\" into nyc-mr1-dev
Tony Mak [Wed, 6 Jul 2016 09:07:02 +0000 (09:07 +0000)]
Merge \"Show info icon when RestrictedListPreference is disabled\" into nyc-mr1-dev
am: b0a4c897ac

Change-Id: Ic9f17f748d414e7c5307d4e81d79a1a55a444091

8 years agoMerge "Show info icon when RestrictedListPreference is disabled" into nyc-mr1-dev
Tony Mak [Wed, 6 Jul 2016 09:01:37 +0000 (09:01 +0000)]
Merge "Show info icon when RestrictedListPreference is disabled" into nyc-mr1-dev

8 years agoImport translations. DO NOT MERGE am: 271f042229 -s ours
Bill Yi [Wed, 6 Jul 2016 04:37:00 +0000 (04:37 +0000)]
Import translations. DO NOT MERGE am: 271f042229  -s ours
am: 45215ab25b  -s ours

Change-Id: I29d78230052fb90e466fcb8c5e954330e05216a8

8 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 6 Jul 2016 04:36:57 +0000 (04:36 +0000)]
Import translations. DO NOT MERGE
am: a937ff573e  -s ours

Change-Id: I714848e4322a4e2ffb6cabc4f99509ab8536c7bd

8 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 6 Jul 2016 04:26:32 +0000 (04:26 +0000)]
Import translations. DO NOT MERGE
am: 271f042229  -s ours

Change-Id: I2286ee629008672002f36dcca7f505898a40d1dd

8 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 6 Jul 2016 02:52:46 +0000 (19:52 -0700)]
Import translations. DO NOT MERGE

Change-Id: I3df812343b69d4e10d3fa2876913a4c7f5698c89
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 6 Jul 2016 02:42:12 +0000 (19:42 -0700)]
Import translations. DO NOT MERGE

Change-Id: Idce951754c8e74f8e6370dc1ad03cebfce4db3c6
Auto-generated-cl: translation import

8 years agoShow info icon when RestrictedListPreference is disabled
Tony Mak [Tue, 28 Jun 2016 15:30:38 +0000 (16:30 +0100)]
Show info icon when RestrictedListPreference is disabled

Fix: 29766349

8 years agoShow 'up arrow' in About phone->Status menu.
Fan Zhang [Fri, 1 Jul 2016 23:46:51 +0000 (16:46 -0700)]
Show 'up arrow' in About phone->Status menu.

Bug: 27970152

Status should be a Submenu to have up arrow. Also cleaned up
AndroidManifest for this fragment as it doesn't need to run in a
separate process.

Change-Id: I0610314b3baa3d5f1f70d255b4657c805c534373

8 years agoMerge \"Update Backup & reset settings to launch the configured activity.\" into...
Doris Ling [Fri, 1 Jul 2016 20:33:11 +0000 (20:33 +0000)]
Merge \"Update Backup & reset settings to launch the configured activity.\" into nyc-mr1-dev
am: f230f4f9ad

Change-Id: I24c3976e863e1a9db02dbf1fee07358e52b72269

8 years agoMerge "Update Backup & reset settings to launch the configured activity." into nyc...
Doris Ling [Fri, 1 Jul 2016 20:15:59 +0000 (20:15 +0000)]
Merge "Update Backup & reset settings to launch the configured activity." into nyc-mr1-dev

8 years agoUpdate Backup & reset settings to launch the configured activity.
Doris Ling [Thu, 16 Jun 2016 01:16:09 +0000 (18:16 -0700)]
Update Backup & reset settings to launch the configured activity.

Check for configured backup settings activity to be used for
Settings->Backup & reset.

Bug: 28942163
Change-Id: I8b937fde5b400afdb81463c9c278b3e3ad42688b

8 years agoMerge \"Update escalation cards layout and data binding.\" into nyc-mr1-dev
Fan Zhang [Fri, 1 Jul 2016 18:31:18 +0000 (18:31 +0000)]
Merge \"Update escalation cards layout and data binding.\" into nyc-mr1-dev
am: eef9dbcdb9

Change-Id: I1d5d80d7c60b72f0cb4d8d9eb91679000f278f6d

8 years agoAdd logging when click tollfree/tolled phone support button
Fan Zhang [Fri, 1 Jul 2016 00:30:29 +0000 (17:30 -0700)]
Add logging when click tollfree/tolled phone support button

Bug: 29105266
Change-Id: Ide67c74b6c072c937f97269ad33800cca68a672d

8 years agoMerge "Update escalation cards layout and data binding." into nyc-mr1-dev
Fan Zhang [Fri, 1 Jul 2016 18:17:38 +0000 (18:17 +0000)]
Merge "Update escalation cards layout and data binding." into nyc-mr1-dev

8 years agoMerge \"Remove dead code that could have a memory leak\" into nyc-mr1-dev
Jason Monk [Fri, 1 Jul 2016 16:07:01 +0000 (16:07 +0000)]
Merge \"Remove dead code that could have a memory leak\" into nyc-mr1-dev
am: d1e94a10eb

Change-Id: I9c9f6f5cce2ff475148d498896dc36f0b381c977

8 years agoMerge "Remove dead code that could have a memory leak" into nyc-mr1-dev
TreeHugger Robot [Fri, 1 Jul 2016 16:00:34 +0000 (16:00 +0000)]
Merge "Remove dead code that could have a memory leak" into nyc-mr1-dev

8 years agoProtect against null carrier config
Jason Monk [Fri, 1 Jul 2016 15:34:37 +0000 (15:34 +0000)]
Protect against null carrier config
am: 934a400ddc

Change-Id: Ieb008120519ad68db85ac709f23a31b70d51d1d7

8 years agoRemove dead code that could have a memory leak
Jason Monk [Fri, 1 Jul 2016 14:28:34 +0000 (10:28 -0400)]
Remove dead code that could have a memory leak

Change-Id: I0a4994f1397160e479cee7eaa1e334e002d28c8c
Fixes: 29115509

8 years agoProtect against null carrier config
Jason Monk [Fri, 1 Jul 2016 13:55:44 +0000 (09:55 -0400)]
Protect against null carrier config

Change-Id: Ida60ead4a85017c29cc8ad3c3e7a462a9e3c720b
Fixes: 28085042

8 years agoImport translations. DO NOT MERGE am: bb3e765b77 -s ours
Bill Yi [Fri, 1 Jul 2016 05:23:05 +0000 (05:23 +0000)]
Import translations. DO NOT MERGE am: bb3e765b77  -s ours
am: 57d0077833  -s ours

Change-Id: Ia3fa4dca2ae1d68b1e42f2f8024971a1f085b17a

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 1 Jul 2016 05:13:39 +0000 (05:13 +0000)]
Import translations. DO NOT MERGE
am: bb3e765b77  -s ours

Change-Id: Ie794d33045a64ba42a7c765e06a7d6fb9531c3da

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 1 Jul 2016 03:20:01 +0000 (20:20 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Ia51772c969ecd375d6ab9b48f27f1d81749cbd50

8 years agoMerge \"Update strings to match the latest mocks.\" into nyc-mr1-dev
Daniel Nishi [Fri, 1 Jul 2016 00:02:10 +0000 (00:02 +0000)]
Merge \"Update strings to match the latest mocks.\" into nyc-mr1-dev
am: 7a23b48266

Change-Id: Icf61ff61f5110c6455c88da9b62026b1b9955484

8 years agoMerge "Update strings to match the latest mocks." into nyc-mr1-dev
Daniel Nishi [Thu, 30 Jun 2016 23:50:47 +0000 (23:50 +0000)]
Merge "Update strings to match the latest mocks." into nyc-mr1-dev

8 years agoMerge \"Fix ugly flash between boot animation and setup wizard (1/2)\" into nyc-mr1-dev
Jorim Jaggi [Thu, 30 Jun 2016 23:10:38 +0000 (23:10 +0000)]
Merge \"Fix ugly flash between boot animation and setup wizard (1/2)\" into nyc-mr1-dev
am: 9711521e3c

Change-Id: Ibe1410573df0d661ae62e45ff798bfbcc0079a1a

8 years agoMerge "Fix ugly flash between boot animation and setup wizard (1/2)" into nyc-mr1-dev
TreeHugger Robot [Thu, 30 Jun 2016 22:58:09 +0000 (22:58 +0000)]
Merge "Fix ugly flash between boot animation and setup wizard (1/2)" into nyc-mr1-dev

8 years agoMerge \"Add text to the Manage Settings page to show freed storage.\" into nyc-mr1-dev
Daniel Nishi [Thu, 30 Jun 2016 21:25:10 +0000 (21:25 +0000)]
Merge \"Add text to the Manage Settings page to show freed storage.\" into nyc-mr1-dev
am: 8c8791a807

Change-Id: I4b09319cf771325d1bbb11214733a45e7b26a3b5

8 years agoMerge "Add text to the Manage Settings page to show freed storage." into nyc-mr1-dev
Daniel Nishi [Thu, 30 Jun 2016 21:17:17 +0000 (21:17 +0000)]
Merge "Add text to the Manage Settings page to show freed storage." into nyc-mr1-dev

8 years agoUpdate strings to match the latest mocks.
Daniel Nishi [Thu, 30 Jun 2016 21:05:22 +0000 (14:05 -0700)]
Update strings to match the latest mocks.

Bug: 29877906
Change-Id: I96338cb42f8e53b0d642e1ad13064fa86cbdc5ba

8 years agoUpdate escalation cards layout and data binding.
Fan Zhang [Thu, 30 Jun 2016 16:36:37 +0000 (09:36 -0700)]
Update escalation cards layout and data binding.

Bug: 29397123

- Updated the UI for support escalation cards so different state have
  the same height and text/button shows up at roughly same place.
- Split data model for escalation cards from SupportData. The data and
  UI between escalation cards and support tiles are different enough
  that it no longer makes sense to share the same data object.

Change-Id: I328cc33961b9638e5e5fc2cad3ebf443991f4d0c

8 years agoMerge \"Add help url for gestures settings.\" into nyc-mr1-dev
Doris Ling [Thu, 30 Jun 2016 20:06:00 +0000 (20:06 +0000)]
Merge \"Add help url for gestures settings.\" into nyc-mr1-dev
am: 0a7300b8d1

Change-Id: Ia267524166ed0c9ffb3f517a0c81119d45e7a57b

8 years agoMerge "Add help url for gestures settings." into nyc-mr1-dev
Doris Ling [Thu, 30 Jun 2016 19:59:20 +0000 (19:59 +0000)]
Merge "Add help url for gestures settings." into nyc-mr1-dev

8 years agoAdd help url for gestures settings.
Doris Ling [Wed, 29 Jun 2016 23:39:36 +0000 (16:39 -0700)]
Add help url for gestures settings.

Override getHelpResource() in GestureSettings and added corresponding
resource string for the help url.

Bug: 29792538
Change-Id: I2f2d93fc25b63266504bd13b954fefa5692e9ddf

8 years agoMerge \"Fix some bluetooth theming issues.\" into nyc-mr1-dev
Andrew Sapperstein [Thu, 30 Jun 2016 17:32:29 +0000 (17:32 +0000)]
Merge \"Fix some bluetooth theming issues.\" into nyc-mr1-dev
am: 6e1336bff1

Change-Id: I8d786d231ab86e18103b4df457ab7a1801df9a28

8 years agoMerge "Fix some bluetooth theming issues." into nyc-mr1-dev
Andrew Sapperstein [Thu, 30 Jun 2016 17:17:19 +0000 (17:17 +0000)]
Merge "Fix some bluetooth theming issues." into nyc-mr1-dev

8 years agoMerge \"Fix a bug where selected country is reset.\" into nyc-mr1-dev
Fan Zhang [Thu, 30 Jun 2016 17:03:04 +0000 (17:03 +0000)]
Merge \"Fix a bug where selected country is reset.\" into nyc-mr1-dev
am: 57824d5aaa

Change-Id: I1b5c64822a80b9cc493b47a4b7a37fb5a19cf3bb

8 years agoFix some bluetooth theming issues.
Andrew Sapperstein [Wed, 29 Jun 2016 21:53:57 +0000 (14:53 -0700)]
Fix some bluetooth theming issues.

The ic_lockscreen_ime wasn't being appropriately colored due to
the (now deleted) override of the assets defined in SettingsLib
that were hardcoded teal. By deleting these, the vector drawable
that's tinted with the accent color is used.

Also fixes the pairing dialog to use DeviceDefault themes.

Fixes: 29837825

Change-Id: I66cd57c00f1eec00346d7d10a86cd9be79d6cf5c

8 years agoMerge "Fix a bug where selected country is reset." into nyc-mr1-dev
TreeHugger Robot [Thu, 30 Jun 2016 16:51:55 +0000 (16:51 +0000)]
Merge "Fix a bug where selected country is reset." into nyc-mr1-dev

8 years agoMerge \"Update UI for support tab.\" into nyc-mr1-dev
Fan Zhang [Thu, 30 Jun 2016 15:28:43 +0000 (15:28 +0000)]
Merge \"Update UI for support tab.\" into nyc-mr1-dev
am: 0293fb40f2

Change-Id: I2126800fbd52201ac25a150ec9e8acf66c0526b1

8 years agoMerge "Update UI for support tab." into nyc-mr1-dev
Fan Zhang [Thu, 30 Jun 2016 15:22:02 +0000 (15:22 +0000)]
Merge "Update UI for support tab." into nyc-mr1-dev

8 years agoDon't show always-on option connecting PPTP vpn
Robin Lee [Mon, 20 Jun 2016 17:22:39 +0000 (18:22 +0100)]
Don't show always-on option connecting PPTP vpn

Support for this kind has been taken out so it shouldn't be an option
when connecting (it's already not an option when editing).

Bug: 28807474
Change-Id: Id3e7be390c6813d091e7f897ac82aaf29042beb8
(cherry picked from commit ca75deb7af290745680e8859a0f8da0770802f6e)

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
Bill Yi [Thu, 30 Jun 2016 03:38:43 +0000 (03:38 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: ebed4797b1  -s ours

Change-Id: Ifb056a801040c094a25ccb1e9d51f82db32f6d40

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 30 Jun 2016 03:28:30 +0000 (03:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE am: ea1e82088e -s ours am: 6c22b54c97 ...
Android Build Merger (Role) [Thu, 30 Jun 2016 03:15:11 +0000 (03:15 +0000)]
Merge "Import translations. DO NOT MERGE am: ea1e82088e  -s ours am: 6c22b54c97  -s ours" into nyc-mr1-dev-plus-aosp

8 years agoImport translations. DO NOT MERGE am: ea1e82088e -s ours
Bill Yi [Thu, 30 Jun 2016 03:14:55 +0000 (03:14 +0000)]
Import translations. DO NOT MERGE am: ea1e82088e  -s ours
am: 6c22b54c97  -s ours

Change-Id: Ie15ea539bd72f49b96641493a77356ac4ebfbac9

8 years agoImport translations. DO NOT MERGE am: ea1e82088e -s ours
Bill Yi [Thu, 30 Jun 2016 03:14:54 +0000 (03:14 +0000)]
Import translations. DO NOT MERGE am: ea1e82088e  -s ours
am: 7d048b49ad  -s ours

Change-Id: I98c7e4be1c71c9520d4ce345114f115decbd8633

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 30 Jun 2016 03:12:28 +0000 (03:12 +0000)]
Import translations. DO NOT MERGE
am: ea1e82088e  -s ours

Change-Id: Id41fa3b1ed36132ae2e12d4045c6f08c9a4892f5

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 30 Jun 2016 03:12:28 +0000 (03:12 +0000)]
Import translations. DO NOT MERGE
am: ea1e82088e  -s ours

Change-Id: I442e044b8a5e2027a409feae9b597fae850d7979

8 years agoMerge \"WiFiCallingSettings: \"Update Emergency Address\" shouldn\'t be disabled...
Meng Wang [Thu, 30 Jun 2016 02:48:17 +0000 (02:48 +0000)]
Merge \"WiFiCallingSettings: \"Update Emergency Address\" shouldn\'t be disabled.\" into nyc-mr1-dev
am: b831223dea

Change-Id: I1dcab97d1dc6e45c6ed5c88caa57156ce5a26b7d

8 years agoMerge "WiFiCallingSettings: "Update Emergency Address" shouldn't be disabled." into...
TreeHugger Robot [Thu, 30 Jun 2016 02:38:12 +0000 (02:38 +0000)]
Merge "WiFiCallingSettings: "Update Emergency Address" shouldn't be disabled." into nyc-mr1-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 30 Jun 2016 01:43:51 +0000 (18:43 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ibe485796993fc2bfad19b2da2ad0b7942a1fd460
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 30 Jun 2016 01:34:49 +0000 (18:34 -0700)]
Import translations. DO NOT MERGE

Change-Id: Idaf99e158ee704e8017b7cb832e7f2dda16ff7bd
Auto-generated-cl: translation import

8 years agoWiFiCallingSettings: "Update Emergency Address" shouldn't be disabled.
Meng Wang [Mon, 27 Jun 2016 23:26:33 +0000 (16:26 -0700)]
WiFiCallingSettings: "Update Emergency Address" shouldn't be disabled.

Bug: 29875773
Change-Id: I3a0277c865c12793ffd9039a9724a1a253b461c9

8 years agoFix ugly flash between boot animation and setup wizard (1/2)
Jorim Jaggi [Wed, 29 Jun 2016 23:33:39 +0000 (16:33 -0700)]
Fix ugly flash between boot animation and setup wizard (1/2)

When FallbackHome is displayed before the setup wizard, we need to
match the last frame of the boot animation in FallbackHome.

Bug: 29054814
Change-Id: I4f0096d398341c3749820177cebc26dea85cea05

8 years agoAdd text to the Manage Settings page to show freed storage.
Daniel Nishi [Fri, 24 Jun 2016 22:53:14 +0000 (15:53 -0700)]
Add text to the Manage Settings page to show freed storage.

Bug: 29643106
Change-Id: Id05dc70e36a690e27cab67fecf921257ed7baf15

8 years agoMerge \"Update the deletion helper intent string.\" into nyc-mr1-dev
Daniel Nishi [Wed, 29 Jun 2016 21:47:16 +0000 (21:47 +0000)]
Merge \"Update the deletion helper intent string.\" into nyc-mr1-dev
am: 148a56f156

Change-Id: I796da8879deede67d28321680b96ff890699c718

8 years agoMerge "Update the deletion helper intent string." into nyc-mr1-dev
Daniel Nishi [Wed, 29 Jun 2016 21:37:05 +0000 (21:37 +0000)]
Merge "Update the deletion helper intent string." into nyc-mr1-dev

8 years agoMerge \"UI Tweak: update setting dashboard cards background color.\" into nyc-mr1-dev
Fan Zhang [Wed, 29 Jun 2016 18:22:42 +0000 (18:22 +0000)]
Merge \"UI Tweak: update setting dashboard cards background color.\" into nyc-mr1-dev
am: e5b195b37a

Change-Id: I4f780a1e369a7e80db41de0d00afff2d74bce72d

8 years agoMerge "UI Tweak: update setting dashboard cards background color." into nyc-mr1-dev
Fan Zhang [Wed, 29 Jun 2016 18:18:32 +0000 (18:18 +0000)]
Merge "UI Tweak: update setting dashboard cards background color." into nyc-mr1-dev

8 years agoMerge \"Update listener for animation in Gesture Settings.\" into nyc-mr1-dev
Doris Ling [Wed, 29 Jun 2016 17:58:54 +0000 (17:58 +0000)]
Merge \"Update listener for animation in Gesture Settings.\" into nyc-mr1-dev
am: b63679157b

Change-Id: I88ee4177303737d1622ba9b326610418c7269a58

8 years agoMerge "Update listener for animation in Gesture Settings." into nyc-mr1-dev
Doris Ling [Wed, 29 Jun 2016 17:49:50 +0000 (17:49 +0000)]
Merge "Update listener for animation in Gesture Settings." into nyc-mr1-dev

8 years agoUpdate UI for support tab.
Fan Zhang [Wed, 29 Jun 2016 15:53:30 +0000 (08:53 -0700)]
Update UI for support tab.

Bug: 29397123
Bug: 29832054

- Increase spinner dropdown width to contain country names.
- Reduce suggestion counter's right padding.
- Tweak paddings in travel abroad phone dialog.
- Update icon and text for help&feedback / tips&tricks.

Change-Id: Ide52c6f8198d1a13a0fdeb000d7cb9e8c03688ca

8 years agoFix a bug where selected country is reset.
Fan Zhang [Wed, 29 Jun 2016 16:39:37 +0000 (09:39 -0700)]
Fix a bug where selected country is reset.

Bug: 29397123

Bug caused by a bad merge.

Change-Id: I6cf4ea8796f712b3d2d9354a9845e9e95eda69b9

8 years agoMerge \"Setup up print settings fragments in onCreateView instead of onCreate.\"...
Philip P. Moltmann [Wed, 29 Jun 2016 15:04:01 +0000 (15:04 +0000)]
Merge \"Setup up print settings fragments in onCreateView instead of onCreate.\" into nyc-mr1-dev
am: 0aad74a387

Change-Id: Ia1d7a4c28840ed7d3c3be56ab21b71800464d787

8 years agoMerge "Setup up print settings fragments in onCreateView instead of onCreate." into...
Philip P. Moltmann [Wed, 29 Jun 2016 14:58:02 +0000 (14:58 +0000)]
Merge "Setup up print settings fragments in onCreateView instead of onCreate." into nyc-mr1-dev

8 years agoMerge \"Lockdown settings in retail demo mode\" into nyc-mr1-dev
Fyodor Kupolov [Tue, 28 Jun 2016 23:14:39 +0000 (23:14 +0000)]
Merge \"Lockdown settings in retail demo mode\" into nyc-mr1-dev
am: cc1379bfea

Change-Id: I49c818af2a1f966c60f7ba184cf50fcfcae788ad

8 years agoMerge "Lockdown settings in retail demo mode" into nyc-mr1-dev
Fyodor Kupolov [Tue, 28 Jun 2016 23:08:46 +0000 (23:08 +0000)]
Merge "Lockdown settings in retail demo mode" into nyc-mr1-dev

8 years agoMerge changes from topics \'offline_operation_hours_part5\', \'offline_operation_hour...
Fan Zhang [Tue, 28 Jun 2016 19:28:11 +0000 (19:28 +0000)]
Merge changes from topics \'offline_operation_hours_part5\', \'offline_operation_hours_part4\' into nyc-mr1-dev
am: 734c550c59

Change-Id: If9d9c8e960fd526e0d6d6df5189ae71de4802421

8 years agoMerge changes from topics 'offline_operation_hours_part5', 'offline_operation_hours_p...
TreeHugger Robot [Tue, 28 Jun 2016 19:20:02 +0000 (19:20 +0000)]
Merge changes from topics 'offline_operation_hours_part5', 'offline_operation_hours_part4' into nyc-mr1-dev

* changes:
  Show a static title/summary if country doesn't have support
  By default select current country in support phone list.

8 years agoUpdate listener for animation in Gesture Settings.
Doris Ling [Tue, 28 Jun 2016 18:55:20 +0000 (11:55 -0700)]
Update listener for animation in Gesture Settings.

Use onClick listener instead of onTouch listener for handling playback
for the animation video.

Bug: 29779942
Change-Id: Ia30c0c49635fedd7f5afd4873ed1971529b99dcc

8 years agoMerge \"Show operation hours for selected country\'s support phone\" into nyc-mr1-dev
Fan Zhang [Tue, 28 Jun 2016 18:13:20 +0000 (18:13 +0000)]
Merge \"Show operation hours for selected country\'s support phone\" into nyc-mr1-dev
am: ab7a6cf828

Change-Id: I325c9dcb1469855d3273e42457ee0e0f3d62d8fa

8 years agoMerge \"Show tolled support number when click travel abroad.\" into nyc-mr1-dev
Fan Zhang [Tue, 28 Jun 2016 18:13:19 +0000 (18:13 +0000)]
Merge \"Show tolled support number when click travel abroad.\" into nyc-mr1-dev
am: 106ff4ff0c

Change-Id: I60c628afcc5d790a22a6baf9f90f9564f06d6b51

8 years agoMerge "Show operation hours for selected country's support phone" into nyc-mr1-dev
Fan Zhang [Tue, 28 Jun 2016 18:10:31 +0000 (18:10 +0000)]
Merge "Show operation hours for selected country's support phone" into nyc-mr1-dev

8 years agoMerge "Show tolled support number when click travel abroad." into nyc-mr1-dev
Fan Zhang [Tue, 28 Jun 2016 18:07:52 +0000 (18:07 +0000)]
Merge "Show tolled support number when click travel abroad." into nyc-mr1-dev

8 years agoMerge \"Update UI for Storage settings.\" into nyc-mr1-dev
Doris Ling [Tue, 28 Jun 2016 17:12:34 +0000 (17:12 +0000)]
Merge \"Update UI for Storage settings.\" into nyc-mr1-dev
am: d65b27a02c

Change-Id: I87a2a929604f6fda9f2805224fffebfddc15e44c

8 years agoMerge "Update UI for Storage settings." into nyc-mr1-dev
Doris Ling [Tue, 28 Jun 2016 17:08:09 +0000 (17:08 +0000)]
Merge "Update UI for Storage settings." into nyc-mr1-dev

8 years agoUI Tweak: update setting dashboard cards background color.
Fan Zhang [Tue, 28 Jun 2016 01:09:18 +0000 (18:09 -0700)]
UI Tweak: update setting dashboard cards background color.

Bug: 29397123
Change-Id: Ie503fa6ae390db3c9e651d8b95e5c86f29bca46c