PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,579 Commits 1 Branch 0 Tags
eebd9292f45ee97eba252d8f1a1ad8a7fdbd53dd
Commit Graph

29579 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daniel Nishi
e5f78124b8 Merge \"Update the deletion helper intent string.\" into nyc-mr1-dev 
am: 148a56f156

Change-Id: I796da8879deede67d28321680b96ff890699c718
 2016-06-29 21:47:16 +00:00
Daniel Nishi
148a56f156 Merge "Update the deletion helper intent string." into nyc-mr1-dev 2016-06-29 21:37:08 +00:00
Fan Zhang
c2296644a5 Merge \\"UI Tweak: update setting dashboard cards background color.\\" into nyc-mr1-dev am: e5b195b37a 
am: 3056cb67a4

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

Change-Id: I4f780a1e369a7e80db41de0d00afff2d74bce72d
 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
Doris Ling
f0beb1f0f5 Merge \\"Update listener for animation in Gesture Settings.\\" into nyc-mr1-dev am: b63679157b 
am: e65dc0d20e

Change-Id: I4134323420a89305415561c96ea87abb1cdc812f
 2016-06-29 18:01:34 +00:00
Doris Ling
e65dc0d20e Merge \"Update listener for animation in Gesture Settings.\" into nyc-mr1-dev 
am: b63679157b

Change-Id: I88ee4177303737d1622ba9b326610418c7269a58
 2016-06-29 17:58:54 +00:00
Doris Ling
b63679157b Merge "Update listener for animation in Gesture Settings." into nyc-mr1-dev 2016-06-29 17:49:50 +00:00
Philip P. Moltmann
a9e812d1b3 Merge \\"Setup up print settings fragments in onCreateView instead of onCreate.\\" into nyc-mr1-dev am: 0aad74a387 
am: d623d3f6d3

Change-Id: Ifcf6aab49fb5ea989862d8a7b882d17761065f6a
 2016-06-29 15:07:08 +00:00
Philip P. Moltmann
d623d3f6d3 Merge \"Setup up print settings fragments in onCreateView instead of onCreate.\" into nyc-mr1-dev 
am: 0aad74a387

Change-Id: Ia1d7a4c28840ed7d3c3be56ab21b71800464d787
 2016-06-29 15:04:01 +00:00
Philip P. Moltmann
0aad74a387 Merge "Setup up print settings fragments in onCreateView instead of onCreate." into nyc-mr1-dev 2016-06-29 14:58:03 +00:00
Fyodor Kupolov
5210fcc801 Merge \\"Lockdown settings in retail demo mode\\" into nyc-mr1-dev am: cc1379bfea 
am: 6622af5d10

Change-Id: Iceb6723dc46305c19da98d8f542633e0c7c17f16
 2016-06-28 23:18:06 +00:00
Fyodor Kupolov
6622af5d10 Merge \"Lockdown settings in retail demo mode\" into nyc-mr1-dev 
am: cc1379bfea

Change-Id: I49c818af2a1f966c60f7ba184cf50fcfcae788ad
 2016-06-28 23:14:39 +00:00
Fyodor Kupolov
cc1379bfea Merge "Lockdown settings in retail demo mode" into nyc-mr1-dev 2016-06-28 23:08:46 +00:00
Muyuan Li
5a48c8493f Only shows music stream when using master stream. 
Bug: 29446492
Change-Id: I52b686daa21499d0b054f762251c544c263fdec4
(cherry picked from commit ec88e104befb872c0bde99871eec73bf5d705369)
 2016-06-28 20:51:32 +00:00
Fan Zhang
f71366d8ef Merge changes from topics \\'offline_operation_hours_part5\\', \\'offline_operation_hours_part4\\' into nyc-mr1-dev am: 734c550c59 
am: 0f38866528

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

Change-Id: If9d9c8e960fd526e0d6d6df5189ae71de4802421
 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
Doris Ling
5d1a512934 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
 2016-06-28 11:55:20 -07:00
Fan Zhang
d85f11eb97 Merge \\"Show operation hours for selected country\\'s support phone\\" into nyc-mr1-dev am: ab7a6cf828 
am: 2768793840

Change-Id: Ib73505b8dd88d725b61cc5d43cc1774ab8cc9694
 2016-06-28 18:16:28 +00:00
Fan Zhang
fd82193e37 Merge \\"Show tolled support number when click travel abroad.\\" into nyc-mr1-dev am: 106ff4ff0c 
am: 45eb3c04b5

Change-Id: I13303f7c82801212034dc2744adb009b6ce00e43
 2016-06-28 18:16:26 +00:00
Fan Zhang
2768793840 Merge \"Show operation hours for selected country\'s support phone\" into nyc-mr1-dev 
am: ab7a6cf828

Change-Id: I325c9dcb1469855d3273e42457ee0e0f3d62d8fa
 2016-06-28 18:13:20 +00:00
Fan Zhang
45eb3c04b5 Merge \"Show tolled support number when click travel abroad.\" into nyc-mr1-dev 
am: 106ff4ff0c

Change-Id: I60c628afcc5d790a22a6baf9f90f9564f06d6b51
 2016-06-28 18:13:19 +00:00
Fan Zhang
ab7a6cf828 Merge "Show operation hours for selected country's support phone" into nyc-mr1-dev 2016-06-28 18:10:32 +00:00
Fan Zhang
106ff4ff0c Merge "Show tolled support number when click travel abroad." into nyc-mr1-dev 2016-06-28 18:07:52 +00:00
Doris Ling
9dac14f9f4 Merge \\"Update UI for Storage settings.\\" into nyc-mr1-dev am: d65b27a02c 
am: 007f83964c

Change-Id: I5b92608ccd6af6d2fccafdbe515ec424a108c4e9
 2016-06-28 17:15:33 +00:00
Doris Ling
007f83964c Merge \"Update UI for Storage settings.\" into nyc-mr1-dev 
am: d65b27a02c

Change-Id: I87a2a929604f6fda9f2805224fffebfddc15e44c
 2016-06-28 17:12:34 +00:00
Doris Ling
d65b27a02c Merge "Update UI for Storage settings." into nyc-mr1-dev 2016-06-28 17:08:09 +00:00
Fan Zhang
8f0a0ac8e7 UI Tweak: update setting dashboard cards background color. 
Bug: 29397123
Change-Id: Ie503fa6ae390db3c9e651d8b95e5c86f29bca46c
 2016-06-28 08:32:31 -07:00
Fan Zhang
0d152844bc Merge \\"Restore selected country when rotating screen.\\" into nyc-mr1-dev am: 53f5539b6b 
am: 973d6d57f0

Change-Id: I43cdffc6ba0bdddb5caf2c7ebcde39d68f5972ac
 2016-06-28 15:20:09 +00:00
Fan Zhang
973d6d57f0 Merge \"Restore selected country when rotating screen.\" into nyc-mr1-dev 
am: 53f5539b6b

Change-Id: Ie4e1578308005b2adae995f372dd0150529da781
 2016-06-28 15:17:23 +00:00
Fan Zhang
53f5539b6b Merge "Restore selected country when rotating screen." into nyc-mr1-dev 2016-06-28 15:12:16 +00:00
Nicolas Prévot
7dc283b1d7 Merge "Don't dismiss remove work profile dialog on orientation change." 2016-06-28 11:15:55 +00:00
Ricky Wai
c070e5e039 Merge \\"Set message id in notification redaction activity\\" into nyc-mr1-dev am: a02e5f73ca 
am: fe1cb3ca19

Change-Id: I95f5659dc91872faff8b1261f25233dc8b55e79a
 2016-06-28 10:45:30 +00:00
Ricky Wai
0c40b37aa1 Merge \\"Refresh screenlock UI after password verification failed\\" into nyc-mr1-dev am: 93071a4bc3 
am: 6bd1003050

Change-Id: Ibbbe57e789c2520b2e5e8ce109ea647de3602134
 2016-06-28 10:45:29 +00:00
Ricky Wai
fe1cb3ca19 Merge \"Set message id in notification redaction activity\" into nyc-mr1-dev 
am: a02e5f73ca

Change-Id: Ia3593ca0a8d64da4efd09cf3c614e028d67e4189
 2016-06-28 10:42:07 +00:00
Ricky Wai
6bd1003050 Merge \"Refresh screenlock UI after password verification failed\" into nyc-mr1-dev 
am: 93071a4bc3

Change-Id: I31282a637f8a9c2f4a92a47596d741e1149b1442
 2016-06-28 10:42:06 +00:00
Ricky Wai
a02e5f73ca Merge "Set message id in notification redaction activity" into nyc-mr1-dev 2016-06-28 10:36:43 +00:00
Ricky Wai
93071a4bc3 Merge "Refresh screenlock UI after password verification failed" into nyc-mr1-dev 2016-06-28 10:36:19 +00:00
Fan Zhang
2c9f35e98d Show a static title/summary if country doesn't have support 
Bug: 29105266
Change-Id: I874fbb1172ab2faf9372362cf0e1f933046c621c
 2016-06-27 17:38:03 -07:00
Fan Zhang
46da9be509 By default select current country in support phone list. 
Bug: 29105266
Change-Id: I78027e5c817aae5e2220bc974e03282d937c33c6
 2016-06-27 17:37:58 -07:00
Fan Zhang
2736ace057 Show operation hours for selected country's support phone 
Bug: 28827790
Change-Id: Idddaefa33cf1a128b70c517b1acb61a2b7bab288
 2016-06-27 15:56:20 -07:00
Fan Zhang
3737fabda4 Show tolled support number when click travel abroad. 
Bug: 29105266
Change-Id: I3020039bafe26e8a494075ad2f192dba07ab6dd0
 2016-06-27 15:56:20 -07:00
Doris Ling
05af648142 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
 2016-06-27 14:23:17 -07:00
Philip P. Moltmann
23176395a5 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
 2016-06-27 21:07:07 +00:00
Steven Ng
c5ba27b885 Merge \\"Update the OEM unlock preference summary to reflect the disable reason\\" into nyc-mr1-dev am: dbb8cab438 
am: 732418cc07

Change-Id: I7a72b986dfa509a0aebc902ed9081f8ef6f3fdaa
 2016-06-27 19:24:22 +00:00
Steven Ng
732418cc07 Merge \"Update the OEM unlock preference summary to reflect the disable reason\" into nyc-mr1-dev 
am: dbb8cab438

Change-Id: Ib90a577fdef5fad79c0bf84b8b50d35f2ff688ed
 2016-06-27 19:20:10 +00:00
Steven Ng
dbb8cab438 Merge "Update the OEM unlock preference summary to reflect the disable reason" into nyc-mr1-dev 2016-06-27 19:14:38 +00:00
Steven Ng
62917c23fa Merge \\"Disable \\"disable\\" button for the device provision app in the Settings app\\" into nyc-mr1-dev am: 8aee45afb6 
am: 4e77176ca3

Change-Id: I86dbad08bd12a2200acc0b341800b2c17d227737
 2016-06-27 19:06:29 +00:00