Fan Zhang
4a1d2c793d
resolve merge conflicts of 9968f7a to nyc-mr1-dev-plus-aosp
...
Change-Id: Ic9a3884cc8bd08eea22d7d83660419ac84555e83
2016-07-06 13:28:19 -07:00
Doris Ling
9a3cf7725b
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
2016-07-06 13:21:08 -07:00
TreeHugger Robot
9968f7a752
Merge "Show 'up arrow' in About phone->Status menu." into nyc-mr1-dev
2016-07-06 20:09:44 +00:00
Maurice Lam
584a11ec4a
Update button styles for fingerprint
...
Use button styles instead of list style because of UX spec change.
Bug: 29421687
Change-Id: Icf178c881c2325b6183de8667a5657b3d2088f72
2016-07-06 18:15:06 +00:00
Bill Yi
a937ff573e
Import translations. DO NOT MERGE
...
Change-Id: I3df812343b69d4e10d3fa2876913a4c7f5698c89
Auto-generated-cl: translation import
2016-07-05 19:52:46 -07:00
Bill Yi
246bcb7b41
Import translations. DO NOT MERGE
...
Change-Id: I9292d04c0981f742b5a71403c58509f1fd4e4d4c
Auto-generated-cl: translation import
2016-07-05 19:05:09 -07:00
Fan Zhang
47e2b976a0
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
2016-07-01 16:51:49 -07:00
Doris Ling
57949a9784
Merge \\"Update Backup & reset settings to launch the configured activity.\\" into nyc-mr1-dev am: f230f4f9ad
...
am: 0fbf0fd198
2016-07-01 20:38:41 +00:00
Doris Ling
0fbf0fd198
Merge \"Update Backup & reset settings to launch the configured activity.\" into nyc-mr1-dev
...
am: f230f4f9ad
2016-07-01 20:33:11 +00:00
Doris Ling
f230f4f9ad
Merge "Update Backup & reset settings to launch the configured activity." into nyc-mr1-dev
2016-07-01 20:15:59 +00:00
Doris Ling
26bf003df9
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
2016-07-01 11:49:03 -07:00
Fan Zhang
bfed632c6e
Merge \\"Update escalation cards layout and data binding.\\" into nyc-mr1-dev am: eef9dbcdb9
...
am: 0e2e738400
2016-07-01 18:36:19 +00:00
Fan Zhang
0e2e738400
Merge \"Update escalation cards layout and data binding.\" into nyc-mr1-dev
...
am: eef9dbcdb9
2016-07-01 18:31:18 +00:00
Fan Zhang
eef9dbcdb9
Merge "Update escalation cards layout and data binding." into nyc-mr1-dev
2016-07-01 18:17:38 +00:00
Daniel Nishi
53027997ff
Merge \\"Update strings to match the latest mocks.\\" into nyc-mr1-dev am: 7a23b48266
...
am: b582e1c7de
2016-07-01 00:35:51 +00:00
Daniel Nishi
b582e1c7de
Merge \"Update strings to match the latest mocks.\" into nyc-mr1-dev
...
am: 7a23b48266
2016-07-01 00:02:10 +00:00
Daniel Nishi
7a23b48266
Merge "Update strings to match the latest mocks." into nyc-mr1-dev
2016-06-30 23:50:47 +00:00
Jorim Jaggi
93779ae3c6
Merge \\"Fix ugly flash between boot animation and setup wizard (1/2)\\" into nyc-mr1-dev am: 9711521e3c
...
am: 92f03e58f3
2016-06-30 23:15:23 +00:00
Jorim Jaggi
92f03e58f3
Merge \"Fix ugly flash between boot animation and setup wizard (1/2)\" into nyc-mr1-dev
...
am: 9711521e3c
2016-06-30 23:10:38 +00:00
TreeHugger Robot
9711521e3c
Merge "Fix ugly flash between boot animation and setup wizard (1/2)" into nyc-mr1-dev
2016-06-30 22:58:09 +00:00
Daniel Nishi
1fde957be1
Merge \\"Add text to the Manage Settings page to show freed storage.\\" into nyc-mr1-dev am: 8c8791a807
...
am: 55f2a8a8b5
2016-06-30 21:31:57 +00:00
Daniel Nishi
55f2a8a8b5
Merge \"Add text to the Manage Settings page to show freed storage.\" into nyc-mr1-dev
...
am: 8c8791a807
2016-06-30 21:25:10 +00:00
Daniel Nishi
8c8791a807
Merge "Add text to the Manage Settings page to show freed storage." into nyc-mr1-dev
2016-06-30 21:17:19 +00:00
Daniel Nishi
9a761788b0
Update strings to match the latest mocks.
...
Bug: 29877906
Change-Id: I96338cb42f8e53b0d642e1ad13064fa86cbdc5ba
2016-06-30 14:05:22 -07:00
Fan Zhang
016bd60491
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
2016-06-30 13:57:22 -07:00
Doris Ling
931c0f92fe
Merge \\"Add help url for gestures settings.\\" into nyc-mr1-dev am: 0a7300b8d1
...
am: 055c48b751
2016-06-30 20:09:33 +00:00
Doris Ling
055c48b751
Merge \"Add help url for gestures settings.\" into nyc-mr1-dev
...
am: 0a7300b8d1
2016-06-30 20:06:00 +00:00
Doris Ling
0a7300b8d1
Merge "Add help url for gestures settings." into nyc-mr1-dev
2016-06-30 19:59:21 +00:00
Doris Ling
ec208fdb8f
Add help url for gestures settings.
...
Override getHelpResource() in GestureSettings and added corresponding
resource string for the help url.
Bug: 29792538
Change-Id: I2f2d93fc25b63266504bd13b954fefa5692e9ddf
2016-06-30 10:53:07 -07:00
Andrew Sapperstein
d2e91f05b1
Merge \\"Fix some bluetooth theming issues.\\" into nyc-mr1-dev am: 6e1336bff1
...
am: 987c5d07ba
2016-06-30 17:41:44 +00:00
Andrew Sapperstein
987c5d07ba
Merge \"Fix some bluetooth theming issues.\" into nyc-mr1-dev
...
am: 6e1336bff1
2016-06-30 17:32:29 +00:00
Andrew Sapperstein
6e1336bff1
Merge "Fix some bluetooth theming issues." into nyc-mr1-dev
2016-06-30 17:17:19 +00:00
Andrew Sapperstein
294469e09a
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
2016-06-30 10:01:59 -07:00
Fan Zhang
a418447608
Merge \\"Update UI for support tab.\\" into nyc-mr1-dev am: 0293fb40f2
...
am: a05a1b15d8
2016-06-30 15:31:15 +00:00
Fan Zhang
a05a1b15d8
Merge \"Update UI for support tab.\" into nyc-mr1-dev
...
am: 0293fb40f2
2016-06-30 15:28:43 +00:00
Fan Zhang
0293fb40f2
Merge "Update UI for support tab." into nyc-mr1-dev
2016-06-30 15:22:02 +00:00
TreeHugger Robot
ebed4797b1
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-06-30 03:28:31 +00:00
TreeHugger Robot
acf52fa03e
Merge "Import translations. DO NOT MERGE"
2016-06-30 03:12:36 +00:00
Bill Yi
f29de0854e
Import translations. DO NOT MERGE
...
Change-Id: Ibe485796993fc2bfad19b2da2ad0b7942a1fd460
Auto-generated-cl: translation import
2016-06-29 18:43:51 -07:00
Bill Yi
98921f0397
Import translations. DO NOT MERGE
...
Change-Id: I1431033a7186031c35440012198f592530d54c39
Auto-generated-cl: translation import
2016-06-29 17:55:51 -07:00
Jorim Jaggi
a616a0dd02
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
2016-06-29 16:57:33 -07:00
Daniel Nishi
1b9afaff2b
Add text to the Manage Settings page to show freed storage.
...
Bug: 29643106
Change-Id: Id05dc70e36a690e27cab67fecf921257ed7baf15
2016-06-29 14:48:50 -07:00
Fan Zhang
c2296644a5
Merge \\"UI Tweak: update setting dashboard cards background color.\\" into nyc-mr1-dev am: e5b195b37a
...
am: 3056cb67a4
2016-06-29 18:25:03 +00:00
Fan Zhang
3056cb67a4
Merge \"UI Tweak: update setting dashboard cards background color.\" into nyc-mr1-dev
...
am: e5b195b37a
2016-06-29 18:22:42 +00:00
Fan Zhang
e5b195b37a
Merge "UI Tweak: update setting dashboard cards background color." into nyc-mr1-dev
2016-06-29 18:18:33 +00:00
Fan Zhang
d89d60d9ca
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
2016-06-29 10:02:09 -07:00
Fan Zhang
f71366d8ef
Merge changes from topics \\'offline_operation_hours_part5\\', \\'offline_operation_hours_part4\\' into nyc-mr1-dev am: 734c550c59
...
am: 0f38866528
2016-06-28 19:34:15 +00:00
Fan Zhang
0f38866528
Merge changes from topics \'offline_operation_hours_part5\', \'offline_operation_hours_part4\' into nyc-mr1-dev
...
am: 734c550c59
2016-06-28 19:28:11 +00:00
TreeHugger Robot
734c550c59
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.
2016-06-28 19:20:03 +00:00
Fan Zhang
d85f11eb97
Merge \\"Show operation hours for selected country\\'s support phone\\" into nyc-mr1-dev am: ab7a6cf828
...
am: 2768793840
2016-06-28 18:16:28 +00:00
