OSDN Git Service
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
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
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
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
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
Jason Monk [Fri, 1 Jul 2016 13:55:44 +0000 (09:55 -0400)]
Protect against null carrier config
Change-Id: Ida60ead4a85017c29cc8ad3c3e7a462a9e3c720b
Fixes:
28085042
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
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
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
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
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
Doris Ling [Thu, 30 Jun 2016 19:59:20 +0000 (19:59 +0000)]
Merge "Add help url for gestures settings." into nyc-mr1-dev
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
Andrew Sapperstein [Thu, 30 Jun 2016 17:17:19 +0000 (17:17 +0000)]
Merge "Fix some bluetooth theming issues." into nyc-mr1-dev
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
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
Fan Zhang [Thu, 30 Jun 2016 15:22:02 +0000 (15:22 +0000)]
Merge "Update UI for support tab." 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
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
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
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
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
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
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
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
Daniel Nishi [Wed, 29 Jun 2016 21:37:05 +0000 (21:37 +0000)]
Merge "Update the deletion helper intent string." 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
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
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
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
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
Fyodor Kupolov [Tue, 28 Jun 2016 23:08:46 +0000 (23:08 +0000)]
Merge "Lockdown settings in retail demo mode" into nyc-mr1-dev
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.
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
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
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
Doris Ling [Tue, 28 Jun 2016 17:08:09 +0000 (17:08 +0000)]
Merge "Update UI for Storage settings." into nyc-mr1-dev
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
Fan Zhang [Tue, 28 Jun 2016 15:12:16 +0000 (15:12 +0000)]
Merge "Restore selected country when rotating screen." into nyc-mr1-dev
Ricky Wai [Tue, 28 Jun 2016 10:36:43 +0000 (10:36 +0000)]
Merge "Set message id in notification redaction activity" into nyc-mr1-dev
Ricky Wai [Tue, 28 Jun 2016 10:36:19 +0000 (10:36 +0000)]
Merge "Refresh screenlock UI after password verification failed" into nyc-mr1-dev
Fan Zhang [Mon, 27 Jun 2016 22:55:34 +0000 (15:55 -0700)]
Show a static title/summary if country doesn't have support
Bug:
29105266
Change-Id: I874fbb1172ab2faf9372362cf0e1f933046c621c
Fan Zhang [Mon, 27 Jun 2016 21:58:34 +0000 (14:58 -0700)]
By default select current country in support phone list.
Bug:
29105266
Change-Id: I78027e5c817aae5e2220bc974e03282d937c33c6
Fan Zhang [Fri, 24 Jun 2016 22:17:09 +0000 (15:17 -0700)]
Show operation hours for selected country's support phone
Bug:
28827790
Change-Id: Idddaefa33cf1a128b70c517b1acb61a2b7bab288
Fan Zhang [Fri, 24 Jun 2016 18:33:35 +0000 (11:33 -0700)]
Show tolled support number when click travel abroad.
Bug:
29105266
Change-Id: I3020039bafe26e8a494075ad2f192dba07ab6dd0
Doris Ling [Mon, 27 Jun 2016 21:23:17 +0000 (14:23 -0700)]
Update UI for Storage settings.
Change the text color for the used storage number to colorAccent and increase the
height of the storage bar graph to match that in Memory settings.
Bug:
29417812
Change-Id: I2a2f6a3fb39c4c23e51a8be8e6feefa101d74797
Philip P. Moltmann [Mon, 27 Jun 2016 20:45:25 +0000 (13:45 -0700)]
Setup up print settings fragments in onCreateView instead of onCreate.
Otherwise some of the layout is not yet set up.
Fixes:
29764546
Change-Id: Ia0716dd0603d66e8bf68494e426756bd553f1afd
Steven Ng [Mon, 27 Jun 2016 19:14:37 +0000 (19:14 +0000)]
Merge "Update the OEM unlock preference summary to reflect the disable reason" into nyc-mr1-dev
Steven Ng [Mon, 27 Jun 2016 18:50:00 +0000 (18:50 +0000)]
Merge "Disable "disable" button for the device provision app in the Settings app" into nyc-mr1-dev
Jason Monk [Mon, 27 Jun 2016 18:42:15 +0000 (18:42 +0000)]
Merge \"Fix DND conditional null state\" into nyc-dev
am:
733649c2fa
Change-Id: Icd64312b660dc1c098772f97731241a9c9a6032c
Jason Monk [Mon, 27 Jun 2016 18:36:21 +0000 (18:36 +0000)]
Merge "Fix DND conditional null state" into nyc-dev
Bill Yi [Mon, 27 Jun 2016 17:50:21 +0000 (17:50 +0000)]
Import translations. DO NOT MERGE
am:
5a9f7d6c9a -s ours
Change-Id: I5007277d9a3e980671925b717d4ae2376f1d37f7
TreeHugger Robot [Mon, 27 Jun 2016 17:27:51 +0000 (17:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Victor Chang [Mon, 27 Jun 2016 17:14:50 +0000 (17:14 +0000)]
Merge "Add explanatory text displayed when 'Always-on' switch is greyed-out for VPN apps w/targetSdk<24" into nyc-mr1-dev
Doris Ling [Mon, 27 Jun 2016 17:08:30 +0000 (17:08 +0000)]
Merge "Update UI for the Gestures settings." into nyc-mr1-dev
Victor Chang [Fri, 24 Jun 2016 15:32:28 +0000 (16:32 +0100)]
Add explanatory text displayed when 'Always-on' switch is greyed-out for VPN apps w/targetSdk<24
Bug:
28413917
Change-Id: I3e7c079b4f91c02e5d0c0e8fda4ac6775dd0247b
Fan Zhang [Mon, 27 Jun 2016 16:56:52 +0000 (09:56 -0700)]
Restore selected country when rotating screen.
Bug:
29105266
Change-Id: I5c070a40465b32b4989481f270c448ba48f0e865
Jason Monk [Mon, 27 Jun 2016 16:29:47 +0000 (12:29 -0400)]
Fix DND conditional null state
Persist all of the data it needs to produce the UI.
Change-Id: Ifb143b2cd3fef075cd77feaf53051eb8b7153a51
Fixes:
27664882
Fan Zhang [Mon, 27 Jun 2016 15:45:53 +0000 (15:45 +0000)]
Merge "When offline show a list of countries with phone support." into nyc-mr1-dev
Bill Yi [Mon, 27 Jun 2016 14:43:13 +0000 (07:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2d819a9b21bbfb288820594955e7b17be7c78e61
Auto-generated-cl: translation import
Bill Yi [Mon, 27 Jun 2016 14:34:32 +0000 (07:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: If45fdc9e3e694f67b9aa78b230fc1491f39f0551
Auto-generated-cl: translation import
Ricky Wai [Mon, 27 Jun 2016 14:02:19 +0000 (15:02 +0100)]
Set message id in notification redaction activity
Bug:
29633162
Change-Id: I803789ba719d4f40629a8da49b47cf4548c072f0
Ricky Wai [Mon, 27 Jun 2016 10:10:09 +0000 (11:10 +0100)]
Refresh screenlock UI after password verification failed
Bug:
28314264
Change-Id: Ibd715d70bbee728a887f779a24bb99ad32d8d2ed
Maurice Lam [Sat, 25 Jun 2016 01:28:42 +0000 (01:28 +0000)]
Merge "Remove setup specific FP find sensor layout" into nyc-mr1-dev
Fan Zhang [Thu, 23 Jun 2016 18:04:21 +0000 (11:04 -0700)]
When offline show a list of countries with phone support.
Bug:
29105266
TODO:
- Support phones UI for international travel
- Selecting default country
- Show operation hours for selected country
Change-Id: I08a6780497dfcb9b9dc8670f2705d01df021c57b
Doris Ling [Wed, 22 Jun 2016 01:25:11 +0000 (18:25 -0700)]
Update UI for the Gestures settings.
1. Remove list divider
2. Set title background color to white
3. Set color filter on animation preview so that its color matches the
color of the video.
Bug:
28565958
Change-Id: I496915ebdb8e358a0f7682f6075d32a04d8d358a
Jason Monk [Fri, 24 Jun 2016 20:26:48 +0000 (20:26 +0000)]
Fix crash in AppDataUsage
am:
3763b581a3
Change-Id: I457ee4ed3c1c83d95f20e8c9004918a140f328a7
Fyodor Kupolov [Fri, 24 Jun 2016 20:01:11 +0000 (13:01 -0700)]
Lockdown settings in retail demo mode
When running in demo mode, additionally disable
the following settings screens:
- Date & Time
- More (network settings)
Bug:
27280140
Change-Id: I3132d0c46b24e1e9ca3842af058073eee3df0c90
mariagpuyol [Thu, 23 Jun 2016 15:06:52 +0000 (08:06 -0700)]
Make Emergency info searchable in Settings
Bug:
27925442
Change-Id: I1318592b09f7cf1daf538edd02321cb6557b289e
Jason Monk [Fri, 24 Jun 2016 14:37:12 +0000 (10:37 -0400)]
Fix crash in AppDataUsage
Better handling of detecting apps
Change-Id: I15644c8d28f394aeac021af856d0d755d7a986c6
Fixes:
29609311
TreeHugger Robot [Fri, 24 Jun 2016 06:32:53 +0000 (06:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Fri, 24 Jun 2016 06:30:26 +0000 (06:30 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
5bb180388a -s ours
Change-Id: I7f0781cb71e8c9382e0085a7070a0c5aa00ae647
TreeHugger Robot [Fri, 24 Jun 2016 06:22:56 +0000 (06:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Fri, 24 Jun 2016 05:11:31 +0000 (22:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I34aedbc52d5223b977ea7ef5899a54bae1bbf51a
Auto-generated-cl: translation import
Bill Yi [Fri, 24 Jun 2016 05:02:51 +0000 (22:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I99973d29e54e0ccd4d0ec2e3e631f0d7d8f57c8a
Auto-generated-cl: translation import
Maurice Lam [Fri, 24 Jun 2016 03:30:52 +0000 (20:30 -0700)]
Remove setup specific FP find sensor layout
Remove the setup variant layout of fingerprint find sensor, because
the regular one is also GLIF themed, and positions the graphic
correctly.
Bug:
29421687
Change-Id: I20dee43c657434f63e73b5c32eb9a492d6786de5
Felipe Leme [Fri, 24 Jun 2016 01:16:29 +0000 (01:16 +0000)]
Don\'t toggle Data Saver again until it receives a callback.
am:
484caa3035
Change-Id: Ib81e52c99e227318a3575c1d7bf03ffd36ce1f74
Felipe Leme [Thu, 23 Jun 2016 22:18:11 +0000 (15:18 -0700)]
Don't toggle Data Saver again until it receives a callback.
BUG:
29253107
Change-Id: I4371f947086a45be6709d2a560d27d1f5f0e79c4
Christine Hallstrom [Wed, 22 Jun 2016 22:46:35 +0000 (15:46 -0700)]
Log whether BT pairing dialog is accepted or canceled
Change-Id: I584cef273f16e27cd7e569b53abccedfe0bd0af7
Jack Yu [Thu, 23 Jun 2016 18:41:21 +0000 (18:41 +0000)]
Merge "Added multi sim support back for brazil channel 50 messages." into nyc-mr1-dev
Andrew Sapperstein [Thu, 23 Jun 2016 18:37:40 +0000 (18:37 +0000)]
Merge "Use colorSecondary for switch bar backgrounds." into nyc-mr1-dev
Fan Zhang [Thu, 23 Jun 2016 17:27:10 +0000 (17:27 +0000)]
Merge "Display operation hours when support is closed." into nyc-mr1-dev
Fan Zhang [Thu, 23 Jun 2016 17:25:22 +0000 (17:25 +0000)]
Merge "Bug fix: support tab doesn't show offline UI initially." into nyc-mr1-dev
Fan Zhang [Thu, 23 Jun 2016 15:38:00 +0000 (08:38 -0700)]
Bug fix: support tab doesn't show offline UI initially.
Bug:
29601818
The support UI correctly monitors network state change after being
displayed, but it fails to set initial hasInternet flag. So we
manually refresh this flag as part of onResume.
Change-Id: Icbf3cca708a961390073cfa77ec08bec7dd4d82f
Steven Ng [Thu, 23 Jun 2016 09:21:05 +0000 (10:21 +0100)]
Update the OEM unlock preference summary to reflect the disable reason
3 cases implemented:
1) Bootloader unlocked
2) Device SIM-locked
3) Device Configuration, such as SIM-lock, has not been retrieved.
Bug:
29047618
Change-Id: Idf5cc1c9b1d105a0efd408cc2aa0e229e874442e
TreeHugger Robot [Thu, 23 Jun 2016 02:51:44 +0000 (02:51 +0000)]
Merge "Flip default value for nav key setting." into nyc-mr1-dev
Daniel Nishi [Thu, 23 Jun 2016 01:41:04 +0000 (18:41 -0700)]
Re-add a string to fix a build breakage.
Change-Id: I079a5643634ffbf68f9414c639a9aba4a8a67d75
Andrew Sapperstein [Thu, 23 Jun 2016 01:04:50 +0000 (18:04 -0700)]
Flip default value for nav key setting.
It's on by default.
BUG:
28565958
BUG:
29550614
Change-Id: I3bec47f9f495bfec946f09d314407e6b48672b0a
Andrew Sapperstein [Thu, 23 Jun 2016 00:29:25 +0000 (00:29 +0000)]
Merge "Flip default values of two gesture settings." into nyc-mr1-dev
Jack Yu [Thu, 23 Jun 2016 00:11:19 +0000 (17:11 -0700)]
Added multi sim support back for brazil channel 50 messages.
Reverted the MSIM removeal CL ag/825835.
bug:
28787384
Change-Id: I2f3691a83c117c2f01a78788d6e95e51a314d51f
TreeHugger Robot [Thu, 23 Jun 2016 00:04:41 +0000 (00:04 +0000)]
Merge "WifiCallingSettings: UI improvement" into nyc-mr1-dev
Daniel Nishi [Wed, 22 Jun 2016 23:52:22 +0000 (23:52 +0000)]
Merge "Remove the Deletion Helper and Automatic Storage Management jobs." into nyc-mr1-dev
Nathan Harold [Wed, 22 Jun 2016 23:20:08 +0000 (23:20 +0000)]
Merge "Add Debug Toggles for Video and WiFI Calling Provisioning" into nyc-mr1-dev
Doris Ling [Wed, 22 Jun 2016 20:29:15 +0000 (20:29 +0000)]
Merge "Make MasterClear a valid entry fragment." into nyc-mr1-dev
Jason Monk [Wed, 22 Jun 2016 19:50:01 +0000 (19:50 +0000)]
Merge \"Workaround to avoid crash in user photo selection\" into nyc-dev
am:
8f75abf92f
Change-Id: Id340d94a65ed656ad003ea310d2c5c476a840999
Meng Wang [Wed, 22 Jun 2016 17:26:40 +0000 (10:26 -0700)]
WifiCallingSettings: UI improvement
Hide 'Update Emergency Address' on resume w/o carrier support
Bug:
29256401
Change-Id: I69f1d533c49614401767832bd502a732699aef22
Jason Monk [Wed, 22 Jun 2016 19:45:07 +0000 (19:45 +0000)]
Merge "Workaround to avoid crash in user photo selection" into nyc-dev
Jason Monk [Wed, 22 Jun 2016 19:09:28 +0000 (19:09 +0000)]
Merge \"Protect against crash in font size\" into nyc-dev
am:
4b336099f1
Change-Id: Ia77306b83425ab46a33c6d8aa386adb5c52f3da5
Jason Monk [Wed, 22 Jun 2016 19:04:16 +0000 (19:04 +0000)]
Merge "Protect against crash in font size" into nyc-dev
Doris Ling [Wed, 22 Jun 2016 01:08:22 +0000 (18:08 -0700)]
Make MasterClear a valid entry fragment.
Add FactoryResetActivity that maps to MasterClear fragment, and add
MasterClear to SettingsActivity's ENTRY_FRAGMENTS so that the
factory data reset fragment can be launched from activity alias.
Bug:
29405129
Change-Id: I8eca6b857987792da8d8678d33e6ab9d4e10793a