Mahaver Chopra
150dd9cc4f
Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev
...
am: e6e8c92134
* commit 'e6e8c92134b7a212058d7728007407eb74720625':
Disallow OEM unlock when DISALLOW_FACTORY_RESET applies
Change-Id: I2389a5518a55fc3131a91fb5a5d8af376d79d936
2016-05-24 12:31:57 +00:00
Mahaver Chopra
e6e8c92134
Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev
2016-05-24 12:23:20 +00:00
Mahaver Chopra
dcf3d7c185
Disallow OEM unlock when DISALLOW_FACTORY_RESET applies
...
Bug: 28339424
Change-Id: I2ccba997fc6c9ccfab802c0f49a9e2115a314552
2016-05-24 12:04:49 +00:00
Maurice Lam
ce16ccb792
Merge "Update margins to match specs" into nyc-mr1-dev am: 3b15d6234d
...
am: 534d856458
* commit '534d85645849a84b122d8a2d1ec7b7bf413ad956':
Update margins to match specs
Change-Id: Ie74c5f7feeb87a59af630d848ffe3e3d3cfb703e
2016-05-24 01:02:07 +00:00
Maurice Lam
534d856458
Merge "Update margins to match specs" into nyc-mr1-dev
...
am: 3b15d6234d
* commit '3b15d6234dc9097869030c1e5e2b26a9b34d1f19':
Update margins to match specs
Change-Id: Iceacbab85dd0697708ddfad1b95b9faccae11a2d
2016-05-24 00:54:11 +00:00
Maurice Lam
3b15d6234d
Merge "Update margins to match specs" into nyc-mr1-dev
2016-05-24 00:45:15 +00:00
Maurice Lam
b357e4a81a
Update margins to match specs
...
- Update settings to use GLIF versions for margins and styles
- Removed learn more link from AOSP Fingerprint intro screen because
it won't have a link to show.
Bug: 28885476
Change-Id: I5d2fd730a1bca2c5da8626da066da3a3f03b4428
2016-05-23 14:51:22 -07:00
Daniel Nishi
435628ac21
Merge "Materialize the button bar in the Deletion Helper." into nyc-mr1-dev am: 64b25588b7
...
am: f16b8be7b4
* commit 'f16b8be7b4c9d9da62ffd60d9c181c2e014c1edd':
Materialize the button bar in the Deletion Helper.
Change-Id: Ifa7291619131002f85288c7da63b70c947125d6d
2016-05-23 20:40:40 +00:00
Daniel Nishi
f16b8be7b4
Merge "Materialize the button bar in the Deletion Helper." into nyc-mr1-dev
...
am: 64b25588b7
* commit '64b25588b7aa1f377ffb1585c1a9f07c1705b7f0':
Materialize the button bar in the Deletion Helper.
Change-Id: Iece17635fc4c7a0ffd112381068b39a84bc3daeb
2016-05-23 20:28:56 +00:00
Daniel Nishi
ba03d2ff21
Update the storage manager settings to match the mocks.
...
Bug: 28560570
Change-Id: I0f218da1d23b687e38c52b5a927f7b84645958c7
2016-05-23 13:27:30 -07:00
Daniel Nishi
64b25588b7
Merge "Materialize the button bar in the Deletion Helper." into nyc-mr1-dev
2016-05-23 20:23:47 +00:00
Andrew Sapperstein
4ab0558972
Delete a bunch of dead code and resources.
...
Deleted a bunch of unused colors. Also deleted the FAB
since it's never actually used, The one xml location sets the visibility
to gone and it is never changed.
Change-Id: I9424d581960ef879f6742bf8f06ac8932224c7cc
2016-05-23 18:50:05 +00:00
Maurice Lam
cbec5aecb5
Merge "Add skip button to fingerprint settings" into nyc-mr1-dev am: c2a929f06a
...
am: d39ac69ef1
* commit 'd39ac69ef1cb75e90e0a574254f917b980df5703':
Add skip button to fingerprint settings
Change-Id: I27dff63a84e78f51cffa636abe49b74309946baa
2016-05-23 18:20:03 +00:00
Maurice Lam
d39ac69ef1
Merge "Add skip button to fingerprint settings" into nyc-mr1-dev
...
am: c2a929f06a
* commit 'c2a929f06ae98346fa1133c50e90888d496bc076':
Add skip button to fingerprint settings
Change-Id: I0f7e22626ec6652bda5d663943cbf2b5875415a3
2016-05-23 18:11:52 +00:00
Maurice Lam
c2a929f06a
Merge "Add skip button to fingerprint settings" into nyc-mr1-dev
2016-05-23 17:56:02 +00:00
Bill Yi
1bc8bb2a70
Import translations. DO NOT MERGE
...
Change-Id: Icbe6d3dd29d739afc90790826bee8f0fc2af028e
Auto-generated-cl: translation import
2016-05-23 06:48:26 -07:00
Bill Yi
906224c4dd
Import translations. DO NOT MERGE
...
Change-Id: I18ff7e3d70d30e76e01214b31c1df2065209f30f
Auto-generated-cl: translation import
2016-05-23 06:35:00 -07:00
Bill Yi
797928a672
Import translations. DO NOT MERGE
...
Change-Id: I1781c1d2edab8e31a79e9bced54f6749dcd9c59d
Auto-generated-cl: translation import
2016-05-23 05:48:27 -07:00
Baligh Uddin
ffe930ec76
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 28857042
Change-Id: I2ef0467d8a959436073642564afcb8fd25d3d09e
2016-05-21 13:10:17 -07:00
Maurice Lam
c1f787d032
Add skip button to fingerprint settings
...
The landscape layout was missing the fingerprint button
Bug: 28810925
Change-Id: Ic47242abdac61985f86cc4837f1c25801ee1248c
2016-05-20 19:03:25 -07:00
Daniel Nishi
5af567eca7
Materialize the button bar in the Deletion Helper.
...
Older Android style buttons were used for the bottom button bar.
By changing them to use the buttonBarBottomStyle, they are updated
to flat buttons. The bottom button bar for settings preference
fragments now more closely tracks the Material Design spec as seen
here in [0].
The other Settings views which use the button bar buttons are the
Redaction settings and WiFi network picker in some contexts. These
should be unaffected as they are based on the SettingsActivity,
rather than the SettingsFragment, and inflate a different view.
[0] https://material-design.storage.googleapis.com/publish/material_v_8/material_ext_publish/0B7WCemMG6e0VaDdZWXpLXzNicjg/components_buttons_usage6.png
Bug: 28845586
Change-Id: I9ea55aa2fe1e76f8f952880675501cbb0f76719d
2016-05-20 16:34:59 -07:00
Felipe Leme
6af9e6a8b4
Merge "Defined help page for Data Saver." into nyc-dev am: f8265a8f1e
am: d21e63fe4b
...
am: 1d6d3723ba
* commit '1d6d3723bae00d0b6fd3f19dc63b0cb396bbc367':
Defined help page for Data Saver.
Change-Id: I5061c9969b538ad3e5f08b6ce95ab6d190955866
2016-05-20 22:11:01 +00:00
Felipe Leme
1d6d3723ba
Merge "Defined help page for Data Saver." into nyc-dev am: f8265a8f1e
...
am: d21e63fe4b
* commit 'd21e63fe4b381354a2033bac1251f4152a7e14a3':
Defined help page for Data Saver.
Change-Id: Ie8761cd677ee5a14a92ba52419d1ee21dfa1befa
2016-05-20 22:08:22 +00:00
Felipe Leme
d21e63fe4b
Merge "Defined help page for Data Saver." into nyc-dev
...
am: f8265a8f1e
* commit 'f8265a8f1ed751d93ef15596658b82748d2a8d28':
Defined help page for Data Saver.
Change-Id: I1430270ab4ac368a6909038ad90816ba67e1d664
2016-05-20 22:06:06 +00:00
Felipe Leme
ec218b75ac
Merge "Defined help page for Data Saver." into nyc-dev
...
am: f8265a8f1e
* commit 'f8265a8f1ed751d93ef15596658b82748d2a8d28':
Defined help page for Data Saver.
Change-Id: I8ee0281525ab7b606bec6262ac2b115cbe31ca2e
2016-05-20 21:33:30 +00:00
Felipe Leme
f8265a8f1e
Merge "Defined help page for Data Saver." into nyc-dev
2016-05-20 21:27:57 +00:00
Felipe Leme
cf2c0b1b97
Defined help page for Data Saver.
...
BUG: 28865521
Change-Id: I07930232312df2775ecee5beacee6921f7245847
2016-05-20 09:08:28 -07:00
Daniel Nishi
bbbdf1fa24
Merge "Add a collapsible checkbox preference for deletion helper." into nyc-mr1-dev am: ab5a648ddb
...
am: d7c52d9a99
* commit 'd7c52d9a992fe799cc2206a6a829d4ab57f77f84':
Add a collapsible checkbox preference for deletion helper.
Change-Id: I63632673593f3f64d53e44425f94d6accec99127
2016-05-20 00:16:36 +00:00
Fan Zhang
f579cf9ae1
Merge "Display disclaimer dialog before starting support." into nyc-mr1-dev am: de188186d8
...
am: 9821904876
* commit '98219048769789a7904c840bf32806cf70f0d56f':
Display disclaimer dialog before starting support.
Change-Id: Ia973f79f522c627ec2e126a42392d00e5d0e371d
2016-05-20 00:16:29 +00:00
Daniel Nishi
d7c52d9a99
Merge "Add a collapsible checkbox preference for deletion helper." into nyc-mr1-dev
...
am: ab5a648ddb
* commit 'ab5a648ddb3e86d16cc6f170407e4b299a7594d5':
Add a collapsible checkbox preference for deletion helper.
Change-Id: Iea651abe1ee6b48017effc23fe63aa3c0593a455
2016-05-19 21:29:28 +00:00
Daniel Nishi
ab5a648ddb
Merge "Add a collapsible checkbox preference for deletion helper." into nyc-mr1-dev
2016-05-19 21:19:02 +00:00
Fan Zhang
9821904876
Merge "Display disclaimer dialog before starting support." into nyc-mr1-dev
...
am: de188186d8
* commit 'de188186d877b178c82c7f6e6d674e13d99ccdfa':
Display disclaimer dialog before starting support.
Change-Id: Ic5e6246e312d66ea178aec8986e5e293d49b08c6
2016-05-19 20:45:14 +00:00
TreeHugger Robot
de188186d8
Merge "Display disclaimer dialog before starting support." into nyc-mr1-dev
2016-05-19 20:41:18 +00:00
Fan Zhang
a2bd32b397
Display disclaimer dialog before starting support.
...
Bug: 28656426
Bug: 28141203
Change-Id: I4fc0d922170badcf5f215fe906fb616c11cf8270
2016-05-19 12:15:38 -07:00
Daniel Nishi
a779cd2b16
Add a collapsible checkbox preference for deletion helper.
...
This adds a custom preference group which has both a checkbox
and collapse/expand behavior. This is intended to be used in
the deletion helper for apps deletion and downloads folder
deletion.
This patch implements the apps deletion integration.
Bug: 28769691
Change-Id: I9fb28a1baa4067841742b5dbeaf2083728c16144
2016-05-19 10:12:59 -07:00
Daniel Nishi
7ad6c44b15
Merge "Add an upsell dialog to activate the storage manager." into nyc-mr1-dev am: 83ff4b06ec
...
am: d85a19a970
* commit 'd85a19a97043eb7c22fee797655cc5cf55022af0':
Add an upsell dialog to activate the storage manager.
Change-Id: I25138268bf7f256f2c4d52b8f083e6e66d721d28
2016-05-19 17:05:15 +00:00
Daniel Nishi
d85a19a970
Merge "Add an upsell dialog to activate the storage manager." into nyc-mr1-dev
...
am: 83ff4b06ec
* commit '83ff4b06ecae86cbfed75938df793628723c076c':
Add an upsell dialog to activate the storage manager.
Change-Id: I0ac4d60411b135db3d3f876f4bec98c2663adf4c
2016-05-19 17:01:27 +00:00
Daniel Nishi
83ff4b06ec
Merge "Add an upsell dialog to activate the storage manager." into nyc-mr1-dev
2016-05-19 16:47:51 +00:00
Kenny Guy
6468225b40
Merge "Update work challenge background image." into nyc-dev am: 726085c5c7
am: 01891c5bf0
...
am: 8da57a60f8
* commit '8da57a60f8e1a61a2e835fb95fd2049a12021a6d':
Update work challenge background image.
Change-Id: Ie1f18ff1c0eaee38362b1432fc26698ecca79ce3
2016-05-19 11:14:37 +00:00
Kenny Guy
8da57a60f8
Merge "Update work challenge background image." into nyc-dev am: 726085c5c7
...
am: 01891c5bf0
* commit '01891c5bf07db8df50bac4b3f21744187815557e':
Update work challenge background image.
Change-Id: I7f41624bd0918f9127c934cfaf15e8762be35c0a
2016-05-19 11:11:08 +00:00
Kenny Guy
01891c5bf0
Merge "Update work challenge background image." into nyc-dev
...
am: 726085c5c7
* commit '726085c5c7016a828850580a21e09d2330a20ce4':
Update work challenge background image.
Change-Id: Iadf215b82f1753c88471acad41ff70fe3242e65a
2016-05-19 11:07:59 +00:00
Kenny Guy
cdc59c8709
Merge "Update work challenge background image." into nyc-dev
...
am: 726085c5c7
* commit '726085c5c7016a828850580a21e09d2330a20ce4':
Update work challenge background image.
Change-Id: Ie16ea20b5c848814d9bd48b1c704f6a3cc73d35c
2016-05-19 11:07:59 +00:00
Kenny Guy
726085c5c7
Merge "Update work challenge background image." into nyc-dev
2016-05-19 11:01:37 +00:00
TreeHugger Robot
35a058ce8c
Merge "Display total storage for Internal shared storage."
2016-05-18 22:35:27 +00:00
Baligh Uddin
7ffeda3633
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-18 19:06:53 +00:00
Baligh Uddin
be840c80cb
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-05-18 19:06:48 +00:00
Baligh Uddin
946a0ead3c
Merge "Import translations. DO NOT MERGE"
2016-05-18 18:56:47 +00:00
Daniel Nishi
0216e9dc2e
Add an upsell dialog to activate the storage manager.
...
After a manual clear, the user will be prompted to turn
on the storage manager, if it is turned off. The prompt
will only show up after certain defined delay times and
stop showing up entirely if denied enough times.
Currently, the dialog does not actually turn on the storage
manager because the storage manager is not yet landed.
Bug: 28801159
Change-Id: I3c221786d08a7102b3b5357416ab12692d1894cf
2016-05-18 09:25:38 -07:00
Kenny Guy
846e182385
Update work challenge background image.
...
Updated so the orange briefcase in the image
isn't central so avoiding clashing with text.
Bug: 28557192
Change-Id: Ic8e4ea71f47449e81619b28b979f59c3d9aaf6a0
2016-05-18 16:14:19 +01:00
pkanwar
553eef0d12
Merge "Choose Bluetooth Device window cant\'t fill screen" into nyc-dev am: 4dd2fdf90b
am: edb9f49afe
...
am: 2a0f73ab89
* commit '2a0f73ab89ae4587ce66b2daa983dcb0d83bf060':
Choose Bluetooth Device window cant't fill screen
Change-Id: I6908ae584f85cf48cbe1d4055dcf3b858c8460b1
2016-05-17 22:40:45 +00:00