Commit Graph

29834 Commits

Author SHA1 Message Date
Bill Yi
5b1a3a40c5 Import translations. DO NOT MERGE am: bb3e765b77 -s ours
am: 57d0077833  -s ours

Change-Id: Ia3fa4dca2ae1d68b1e42f2f8024971a1f085b17a
2016-07-01 05:23:05 +00:00
Bill Yi
57d0077833 Import translations. DO NOT MERGE
am: bb3e765b77  -s ours

Change-Id: Ie794d33045a64ba42a7c765e06a7d6fb9531c3da
2016-07-01 05:13:39 +00:00
Bill Yi
bb3e765b77 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Ia51772c969ecd375d6ab9b48f27f1d81749cbd50
2016-06-30 20:20:01 -07:00
Daniel Nishi
53027997ff Merge \\"Update strings to match the latest mocks.\\" into nyc-mr1-dev am: 7a23b48266
am: b582e1c7de

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

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

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

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

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

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

Change-Id: I37d6d591aa8da8689e5721dd97a2fc7d22e645d7
2016-06-30 20:09:33 +00:00
Doris Ling
055c48b751 Merge \"Add help url for gestures settings.\" into nyc-mr1-dev
am: 0a7300b8d1

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

Change-Id: Ifb9ede98982d50a17d0ebeec8f0110226b153dcb
2016-06-30 17:41:44 +00:00
Andrew Sapperstein
987c5d07ba Merge \"Fix some bluetooth theming issues.\" into nyc-mr1-dev
am: 6e1336bff1

Change-Id: I8d786d231ab86e18103b4df457ab7a1801df9a28
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
Fan Zhang
65db222528 Merge \\"Fix a bug where selected country is reset.\\" into nyc-mr1-dev am: 57824d5aaa
am: 8ea45ff337

Change-Id: I18b4ed3a9f502bdb5cd06dcadad495d40714319b
2016-06-30 17:06:04 +00:00
Fan Zhang
8ea45ff337 Merge \"Fix a bug where selected country is reset.\" into nyc-mr1-dev
am: 57824d5aaa

Change-Id: I1b5c64822a80b9cc493b47a4b7a37fb5a19cf3bb
2016-06-30 17:03:04 +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
TreeHugger Robot
57824d5aaa Merge "Fix a bug where selected country is reset." into nyc-mr1-dev 2016-06-30 16:51:55 +00:00
Fan Zhang
a418447608 Merge \\"Update UI for support tab.\\" into nyc-mr1-dev am: 0293fb40f2
am: a05a1b15d8

Change-Id: Ib4835e280ed30e690405a745e70d089143b92327
2016-06-30 15:31:15 +00:00
Fan Zhang
a05a1b15d8 Merge \"Update UI for support tab.\" into nyc-mr1-dev
am: 0293fb40f2

Change-Id: I2126800fbd52201ac25a150ec9e8acf66c0526b1
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
Tony Mak
6330e20b57 Merge "Show info icon when RestrictedListPreference is disabled" 2016-06-30 10:47:29 +00:00
Robin Lee
07127d83a6 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 ca75deb7af)
2016-06-30 09:05:58 +00:00
Bill Yi
96e3795f0b Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: ebed4797b1 -s ours
am: 636cf49c27  -s ours

Change-Id: I8ffe6b20738c79c9f92899840132207716ea65f9
2016-06-30 03:41:06 +00:00
Bill Yi
636cf49c27 Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: ebed4797b1  -s ours

Change-Id: Ifb056a801040c094a25ccb1e9d51f82db32f6d40
2016-06-30 03:38:43 +00:00
TreeHugger Robot
ebed4797b1 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-30 03:28:31 +00:00
Bill Yi
2af5ef5928 Merge \"Import translations. DO NOT MERGE am: ea1e82088e -s ours am: 6c22b54c97 -s ours\" into nyc-mr1-dev-plus-aosp
am: 68a1509eb6  -s ours

Change-Id: Id30c8f4c1cdc5b075078c786903831a17b3943be
2016-06-30 03:17:27 +00:00
Bill Yi
e2c3836d42 Import translations. DO NOT MERGE am: ea1e82088e -s ours am: 7d048b49ad -s ours
am: 28c008d6a3  -s ours

Change-Id: Idc2b02b2859e221a17351f534897a17a9b9f37dd
2016-06-30 03:17:25 +00:00
Android Build Merger (Role)
68a1509eb6 Merge "Import translations. DO NOT MERGE am: ea1e82088e -s ours am: 6c22b54c97 -s ours" into nyc-mr1-dev-plus-aosp 2016-06-30 03:15:12 +00:00
Bill Yi
9fde76f19c Import translations. DO NOT MERGE am: ea1e82088e -s ours
am: 6c22b54c97  -s ours

Change-Id: Ie15ea539bd72f49b96641493a77356ac4ebfbac9
2016-06-30 03:14:55 +00:00
Bill Yi
28c008d6a3 Import translations. DO NOT MERGE am: ea1e82088e -s ours
am: 7d048b49ad  -s ours

Change-Id: I98c7e4be1c71c9520d4ce345114f115decbd8633
2016-06-30 03:14:54 +00:00
TreeHugger Robot
acf52fa03e Merge "Import translations. DO NOT MERGE" 2016-06-30 03:12:36 +00:00
Bill Yi
7d048b49ad Import translations. DO NOT MERGE
am: ea1e82088e  -s ours

Change-Id: Id41fa3b1ed36132ae2e12d4045c6f08c9a4892f5
2016-06-30 03:12:28 +00:00
Bill Yi
6c22b54c97 Import translations. DO NOT MERGE
am: ea1e82088e  -s ours

Change-Id: I442e044b8a5e2027a409feae9b597fae850d7979
2016-06-30 03:12:28 +00:00
Meng Wang
702fafb72e Merge \\"WiFiCallingSettings: \\"Update Emergency Address\\" shouldn\\'t be disabled.\\" into nyc-mr1-dev am: b831223dea
am: f68b06a6a0

Change-Id: Ie72dec382011386ff28bb51494e88ee098fd5fdc
2016-06-30 02:54:49 +00:00
Meng Wang
f68b06a6a0 Merge \"WiFiCallingSettings: \"Update Emergency Address\" shouldn\'t be disabled.\" into nyc-mr1-dev
am: b831223dea

Change-Id: I1dcab97d1dc6e45c6ed5c88caa57156ce5a26b7d
2016-06-30 02:48:17 +00:00
TreeHugger Robot
b831223dea Merge "WiFiCallingSettings: "Update Emergency Address" shouldn't be disabled." into nyc-mr1-dev 2016-06-30 02:38:12 +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
ea1e82088e Import translations. DO NOT MERGE
Change-Id: Idaf99e158ee704e8017b7cb832e7f2dda16ff7bd
Auto-generated-cl: translation import
2016-06-29 18:34:49 -07:00
Meng Wang
b97b16da91 WiFiCallingSettings: "Update Emergency Address" shouldn't be disabled.
Bug: 29875773
Change-Id: I3a0277c865c12793ffd9039a9724a1a253b461c9
2016-06-29 18:07:55 -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
eebd9292f4 Merge \\"Update the deletion helper intent string.\\" into nyc-mr1-dev am: 148a56f156
am: e5f78124b8

Change-Id: I9305eaebfe680ee47782bc04ae527d3843933e0d
2016-06-29 21:54:14 +00:00