Commit Graph

1461 Commits

Author SHA1 Message Date
Fan Zhang
1d090c798f Merge "Dashboard status cards UI." 2016-04-07 23:10:07 +00:00
Fan Zhang
d42e233bf0 Dashboard status cards UI.
Bug: 27907841

This adds a card view type to display status in Settings dashboard. Also
added necessary pieces to layout status and condition views properly.

The data for status is not wired up yet.

Change-Id: I8ed624177645f389ec0bb71420f073c6dbc03ccb
2016-04-07 13:23:37 -07:00
Winston Man
6f250236dc Amend icon size for delete work profile dialog am: 90aec18
am: bea2dd7

* commit 'bea2dd773d40b2bcb5c317ae060b7cd5094e48b3':
  Amend icon size for delete work profile dialog

Change-Id: I5f17e6cb394039b4b88de3163edd13223809027e
2016-04-07 09:51:20 +00:00
Winston Man
bea2dd773d Amend icon size for delete work profile dialog
am: 90aec18

* commit '90aec184b4229afca5cd7ae549b49ae8f93fd1e7':
  Amend icon size for delete work profile dialog

Change-Id: I7ee70923ea575aae530304472acdfd34438bd898
2016-04-07 09:48:20 +00:00
Winston Man
90aec184b4 Amend icon size for delete work profile dialog
Changes are referenced from
https://cs.corp.google.com/android/packages/apps/ManagedProvisioning/res/layout/device_manager_icon_label.xml

Fixed screenshot:
https://screenshot.googleplex.com/01qOjUp0rp8

Bug:27636781

Change-Id: Ib6cf303caa388a8b0d2b7664fd9828a8d2f67098
2016-04-07 09:42:11 +00:00
Fan Zhang
a911917162 Merge "Add a RecyclerView adapter for first tab in settings." 2016-04-06 20:40:28 +00:00
Alan Viverette
1c12b99a2f Merge "Use normal button style for Clear data / cache buttons" into nyc-dev am: b5e2f54
am: 28cc7c1

* commit '28cc7c12c60a5426ec30b4e8dd67f4d95ef7fcd4':
  Use normal button style for Clear data / cache buttons

Change-Id: I89e45d6b52875dd163b7e7993febed2262aefea2
2016-04-06 17:51:20 +00:00
Alan Viverette
28cc7c12c6 Merge "Use normal button style for Clear data / cache buttons" into nyc-dev
am: b5e2f54

* commit 'b5e2f54cc3cc07391d28b5e044d7d03389226272':
  Use normal button style for Clear data / cache buttons

Change-Id: Ifaee51792629609924b623461e1b0a91938dc4d5
2016-04-06 17:45:19 +00:00
Alan Viverette
b5e2f54cc3 Merge "Use normal button style for Clear data / cache buttons" into nyc-dev 2016-04-06 17:36:35 +00:00
Pankaj Kanwar
fe78760b3d Merge "Fix problem with message indent. b/25054130" into nyc-dev am: e6924ce
am: 37ac1d5

* commit '37ac1d5d46daef83558d2f5b7e7ec8071bf380bc':
  Fix problem with message indent. b/25054130

Change-Id: I8c9205264c3402e0ac7a56015fe6a00e3be1b9f2
2016-04-06 17:17:21 +00:00
Fan Zhang
44e7be1289 Add a RecyclerView adapter for first tab in settings.
Bug: 27907841

The new adapter eventually will contain: conditionals, status,
suggestions.

Change-Id: I62f9db3db6557b16255ad94e2ce166b3c376e1bb
2016-04-06 10:13:38 -07:00
pkanwar
37ac1d5d46 Merge "Fix problem with message indent. b/25054130" into nyc-dev
am: e6924ce

* commit 'e6924ce8caa2177df5819abc2c7c1ebd91077038':
  Fix problem with message indent. b/25054130

Change-Id: I8581d1b47ebc5334e8baaca7209644ad3df19fb0
2016-04-06 17:08:21 +00:00
pkanwar
0b390884c2 Fix problem with message indent.
b/25054130

Change-Id: I16327683f970c5b9a23316984e1815227d265c57
2016-04-06 16:53:20 +00:00
Qi Ding
519ca78639 Merge "Fix end padding of summary text for dialog is too narrow" am: dc07c29 am: 69960b8
am: cd79f40

* commit 'cd79f4058363a3e8e5366e1261aa8911f3846575':
  Fix end padding of summary text for dialog is too narrow

Change-Id: I6f112eb356cc3bf28bd9abff134e317c3cceced9
2016-04-05 14:41:44 +00:00
Jason Monk
cd79f40583 Merge "Fix end padding of summary text for dialog is too narrow" am: dc07c29
am: 69960b8

* commit '69960b8da7eec23fb2ee0b9199c2e2ea9e131a08':
  Fix end padding of summary text for dialog is too narrow

Change-Id: I987214f302cd56fd1301ebe7307f843c5da276a5
2016-04-05 14:38:54 +00:00
Qi Ding
e5d4a5db28 Fix end padding of summary text for dialog is too narrow
The end padding of summary text is too narrow,
so "dialogPreferredPadding" attribute should be used
as the end padding of the whole list item.

Change-Id: I348c1a0ac8da011b4971b4f38c7f5ee3e295146f
2016-04-05 11:31:36 +09:00
Rachel Zhang
12b2261033 Merge "Add suggestion carousel view and dependencies to settings" 2016-04-01 17:35:47 +00:00
Alan Viverette
26753d7106 Use normal button style for Clear data / cache buttons
Bug: 27967106
Change-Id: I251edc122a74c69e8174b8467c36c28ca47aa853
2016-04-01 12:26:11 -04:00
Fan Zhang
3feafd22ed Add an empty status fragment for status and suggestions.
Bug: 27927402

Also add a TabLayout to show title for these fragments, inspired by
http://goo.gl/aOt51Q

Change-Id: I40bab3075480670558ac9a896337109f10e8c90c
2016-04-01 09:07:31 -07:00
Rachel Zhang
0050ac0bb7 Add suggestion carousel view and dependencies to settings
Bug: 27752219
Change-Id: Idc14227990c902c04de5bfb6649efb6da64c9168
2016-03-31 14:12:26 -07:00
Jason Monk
ae130a27c5 Merge "Fix categeries being read out on settings dashboard" into nyc-dev am: 69446e8
am: d09508b

* commit 'd09508b8fc2c6fd917ab2f69e1014fa96edf2e1d':
  Fix categeries being read out on settings dashboard

Change-Id: I3ffd285de257ed9171a5b0d9f11f61305f22f4bf
2016-03-31 15:50:46 +00:00
Jason Monk
9c868652ba Fix categeries being read out on settings dashboard
Change-Id: Ica0eec62a532fa40b57553e8e3d9fba1cba3bd4e
Fixes: 26125682
2016-03-31 10:35:03 -04:00
Noah Wang
a0c429a1b6 Merge "Make preview screens in font/display size settings scrollable Bug: 27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82" into nyc-dev am: 74df3ec
am: 3859720

* commit '38597204cb0a77fb05a1b4d51386db10842d8520':
  Make preview screens in font/display size settings scrollable Bug: 27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82

Change-Id: I6d180d1d44799046fadbbde7f2f4a743bf1762cc
2016-03-30 21:53:05 +00:00
Noah Wang
74df3ec002 Merge "Make preview screens in font/display size settings scrollable Bug: 27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82" into nyc-dev 2016-03-30 21:41:42 +00:00
Noah Wang
abf6312b8d Make preview screens in font/display size settings scrollable
Bug: 27274145
Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82
2016-03-30 14:32:32 -07:00
Noah Wang
f6df3bcc58 Merge "Adding contentDescription to ViewPager in font/display size settings. Bug: 27326035" into nyc-dev am: 1308bd8
am: 825b050

* commit '825b0506ff116f850ca81758700281da2b248b8f':
  Adding contentDescription to ViewPager in font/display size settings. Bug: 27326035

Change-Id: I4ef8fea79b756cc902415c456b6c850c18f4eb15
2016-03-30 20:10:47 +00:00
Noah Wang
277081a3f5 Merge "Set minimum height for preview screen of font/display size settings Bug: 27699996" into nyc-dev am: bcf590c
am: 88bb01d

* commit '88bb01d96f0a955a8366a7610363f959e2f71d8d':
  Set minimum height for preview screen of font/display size settings Bug: 27699996

Change-Id: I57d61b0fffc8e4425e9d2348917d5aa385e1546b
2016-03-30 20:10:46 +00:00
Noah Wang
1308bd8bb1 Merge "Adding contentDescription to ViewPager in font/display size settings. Bug: 27326035" into nyc-dev 2016-03-30 20:03:38 +00:00
Noah Wang
bcf590c88a Merge "Set minimum height for preview screen of font/display size settings Bug: 27699996" into nyc-dev 2016-03-30 20:03:13 +00:00
Jason Monk
6e20cd86b2 resolve merge conflicts of 4038f15 to master
Change-Id: Ifae7060ab23ad7619a5fdd01315a2d3e7c8a3845
2016-03-30 12:58:09 -04:00
Jason Monk
5b39710e6d Fix sim pin settings
Change-Id: I8fba2a367958da5831efd04f599ba7a363d11a1f
Fixes: 27419276
Fixes: 27529989
2016-03-30 11:41:45 -04:00
Noah Wang
a8ef32b969 Adding contentDescription to ViewPager in font/display size settings.
Bug: 27326035

Change-Id: I416c05f2fc7c9238a61b8d512f09cb834f8ec537
2016-03-29 21:32:18 -07:00
Noah Wang
80a0e93c8d Set minimum height for preview screen of font/display size settings
Bug: 27699996

Change-Id: I1e2e16a355993f058301c57d29857f6fca8ec858
2016-03-29 21:04:17 -07:00
Noah Wang
854823acc7 Merge "Replace "A" icon with underline with simple "A" icon on font size settings screen Bug: 27694339" into nyc-dev am: a859441
am: 92ab671

* commit '92ab671167cb8022e0da07c48ab53cd4dd67dab1':
  Replace "A" icon with underline with simple "A" icon on font size settings screen Bug: 27694339

Change-Id: I724a7b9488dfb4cd355402d4e4855b2cacd8878b
2016-03-29 22:07:02 +00:00
Noah Wang
a85944104c Merge "Replace "A" icon with underline with simple "A" icon on font size settings screen Bug: 27694339" into nyc-dev 2016-03-29 21:56:14 +00:00
Victor Chang
347888f094 Merge "Remove VPN Overflow menu" into nyc-dev am: 2037876
am: 24ac9d9

* commit '24ac9d93ca792b8081b745deb8a3a32f0dd30ef5':
  Remove VPN Overflow menu

Change-Id: Iae3c768d4a4891c9e4413502225c44014bacaf0b
2016-03-29 19:02:42 +00:00
Victor Chang
2037876888 Merge "Remove VPN Overflow menu" into nyc-dev 2016-03-29 18:51:33 +00:00
Victor Chang
6005aefd44 Remove VPN Overflow menu
- Move always-on option for legacy vpn into the legacy vpn config page
- This implementation doesn't show dialogue when replacing existing always-on vpn
- Continue to disable lockdown option for legacy vpn when "persist.radio.imsregrequired" is true.
  Not applying to vpn app
- Force to save account info when legacy vpn is always-on
- When legacy vpn is always-on, don't try to connect. (Otherwise, an exception is thrown)

TODO: Remove EXTRA_PICK_LOCKDOWN in LockdownVpnTracker in framework

Bug: 26950700
Change-Id: Ia80669359c0b7cdb955c84937156c020ac6e9af5
2016-03-29 17:28:36 +01:00
Noah Wang
863c595262 Replace "A" icon with underline with simple "A" icon on font size
settings screen
Bug: 27694339

Change-Id: I56c3b2bbaec36022730a8d392531f9e13d612184
2016-03-28 20:18:31 -07:00
Anna Galusza
39936ec7bb Merge "Fix padding on Font size and Display size preview screens. Bug: 27675989" into nyc-dev am: 8870706
am: 4065586

* commit '4065586a29e70702351eece01a7955502b14dd35':
  Fix padding on Font size and Display size preview screens. Bug: 27675989
2016-03-28 22:41:18 +00:00
Anna Galusza
8870706614 Merge "Fix padding on Font size and Display size preview screens. Bug: 27675989" into nyc-dev 2016-03-28 18:14:49 +00:00
Fan Zhang
94df695453 Add a DashboardContainerFragment to host DashboardSummary.
Eventually the container fragment will host more dashboard-type
fragments. For now it's just DashboardSummary.

Change-Id: I217ad71c2f2bbc4b7247c9dd2c3c2b8c8660d945
2016-03-28 09:35:14 -07:00
Udam Saini
375b981267 Merge "Updates spacing on redaction interstitial" into nyc-dev 2016-03-24 22:20:10 +00:00
Hall Liu
f3dc18b65b Merge "Add indicator for system dialer in Settings" into nyc-dev 2016-03-24 17:29:39 +00:00
Udam Saini
ec0baa9701 Updates spacing on redaction interstitial
Cleans up the look and feel on the redaction interstitial page

bug:27534261
Change-Id: I9495cfc9493f0d199b30335985761d069a29d42d
2016-03-23 11:29:15 -07:00
Victor Chang
32da1ecdca Merge "Per vpn setting change in VPN list" into nyc-dev 2016-03-21 15:20:14 +00:00
Victor Chang
14c2ac4dcb Per vpn setting change in VPN list
- Show admin support details when user taps on a cell and user restriction is on
- Show always-on-vpn active status in preference summary
- User can still open non-configurable per-VPN info page even when user restriction is applied
- Rename ConfigPreference to LegacyVpnPreference
- Move summary String handling into ManageablePreference
- ManageablePreference inherits GearPreference to reuse the code
- Don't show disconnect dialog when always-on is enabled

BUG=26950700

Change-Id: I37b087879cf3b674df528e7787d7bb1eead3310f
2016-03-21 12:36:44 +00:00
Hall Liu
cbde0b8afd Add indicator for system dialer in Settings
Bug: 26748630
Change-Id: I60b9f2783fb4c1f49c79449dd150132c73a9fb2a
2016-03-18 16:49:16 -07:00
Abodunrinwa Toki
4873230326 Merge "Work challenge background: Fix top padding" into nyc-dev 2016-03-18 15:30:01 +00:00
Abodunrinwa Toki
af700ec6e0 Work challenge background: Fix top padding
Bug: 27693796
Change-Id: Iafda9dfed2b87c3618c155d4434d5895547f6fe0
2016-03-17 18:48:05 +00:00