Commit Graph

1165 Commits

Author SHA1 Message Date
Paul Lawrence
d300f3f3a4 Merge "Set font sizes of typed passwords and pins to match keyguard" 2015-01-16 14:59:48 +00:00
Paul Lawrence
33c4f7b4c7 Set font sizes of typed passwords and pins to match keyguard
Bug: 17887105
Change-Id: I598c6224b501078e9a99c9e73aa1411b430847a9
2015-01-15 15:49:40 -08:00
Maurice Lam
859dcab128 Remove grey Wi-Fi icon from Setup Wizard
This removes the grey Wi-Fi icon from the empty-view in the Wi-Fi
list of Setup Wizard. Also updated the style so it looks like the
description text in other setup screens.
Also fixed the view recycling by not calling getRootAdapter in
onActivityCreated, since that will cause the Preference framework
to not cache the AccessPoint preference.

Bug: 17575719
Bug: 16518752
Change-Id: I06cbc88db1c04b29a9ce8221596265effc39b90b
2015-01-15 14:33:31 -08:00
Fyodor Kupolov
bc02b84cb5 Show Location restriction without the Settings item
In App & content access page for restricted profiles, Location restriction
should be shown without its parent element.

Also fixed an issue when app summary may be incomplete.

Bug:15761405,17182612
Change-Id: Ia298cf581413d124d25608f825f97a9e64baf479
2015-01-15 11:58:19 -08:00
Prem Kumar
394cc0a898 am 78670560: am 96ca2cfd: Merge "Clearing junk layout for add wifi dialog in settings." into lmp-mr1-dev automerge: f41c6c4
* commit '78670560cddf0f1e2cff7dab57b2ac768f917367':
  Clearing junk layout for add wifi dialog in settings.
2014-12-12 04:40:32 +00:00
Prem Kumar
96ca2cfd08 Merge "Clearing junk layout for add wifi dialog in settings." into lmp-mr1-dev 2014-12-12 00:52:32 +00:00
Sanket Padawe
9235e673f9 Clearing junk layout for add wifi dialog in settings.
Bug: 18359901
Change-Id: I9957efd0a6740ee470ee36b09a7b6884a0d2c63a
2014-12-11 15:48:45 -08:00
Maurice Lam
00a89f1439 am 8fcbe816: am 400e9378: Merge "[FRP] Don\'t extract IME for PIN / Password during setup" into lmp-mr1-dev
automerge: 86ed2cf

* commit '86ed2cf33fa82aac1606e2a6e217fdff4ef6ef8f':
  [FRP] Don't extract IME for PIN / Password during setup
2014-12-09 23:15:21 +00:00
Maurice Lam
4dd6de9228 am 5c325c4d: am ecf2f401: am 2c0c9837: Merge "[FRP] Use setup wizard nav bar buttons" into lmp-mr1-dev
* commit '5c325c4d8cd9a0c1195b3d02b31f6073fbff09a2':
  [FRP] Use setup wizard nav bar buttons
2014-12-09 00:55:40 +00:00
Maurice Lam
10a4d5c2de am 3d9267f3: am 40a252ce: am dfaf4c92: Merge "[FRP] Add illustration to lock screen setup" into lmp-mr1-dev
* commit '3d9267f307ea484a46b95c80ac501fc4ee1fc4c2':
  [FRP] Add illustration to lock screen setup
2014-12-09 00:55:37 +00:00
Maurice Lam
400e937850 Merge "[FRP] Don't extract IME for PIN / Password during setup" into lmp-mr1-dev 2014-12-06 03:03:56 +00:00
Maurice Lam
4170f0e567 [FRP] Don't extract IME for PIN / Password during setup
Add the flagNoExtractUi to the password / PIN entry field so that it
will not be extracted to a fullscreen mode in phone landscape.

The phone landscape UI currently provides a poor experience because
it masks the message shown to the user (e.g. Passwords require at
least 4 characters)

Bug: 18640065
Change-Id: If67c8f9ae761f1ffda4f841e421e0fd651651649
2014-12-05 11:14:01 -08:00
Maurice Lam
2c0c983755 Merge "[FRP] Use setup wizard nav bar buttons" into lmp-mr1-dev 2014-12-05 03:21:53 +00:00
Maurice Lam
dfaf4c92c1 Merge "[FRP] Add illustration to lock screen setup" into lmp-mr1-dev 2014-12-05 00:23:00 +00:00
Amith Yamasani
0c8a2d63be am a7ddb536: am 53e8940b: am 6ff07c41: Merge "Fix padding in user type selection dialog" into lmp-mr1-dev
* commit 'a7ddb536fd9ed69f8436f1f786ca576fd34effa3':
  Fix padding in user type selection dialog
2014-12-05 00:14:14 +00:00
Maurice Lam
af103b4eb4 [FRP] Use setup wizard nav bar buttons
Use setup wizard nav bar buttons instead of custom button bar for
lock screen setup.

Bug: 18482708
Change-Id: I471f475ebe6bc7ba8cfbd179daddd854c1b6982a
2014-12-04 12:20:47 -08:00
Maurice Lam
1227a19ecc [FRP] Add illustration to lock screen setup
Added the illustration JPG files, and added
SetupWizardUtils.setIllustration method that will change the
illustrations in the layout.

Bug: 18482708
Change-Id: I8c6758113f07cd33f85eaf6bc019e8194d9a17ce
2014-12-03 21:19:21 -08:00
Amith Yamasani
6ff07c418f Merge "Fix padding in user type selection dialog" into lmp-mr1-dev 2014-12-04 01:50:05 +00:00
Amith Yamasani
f3db021ba5 Fix padding in user type selection dialog
Use preferred list item padding for the list items
and use the dialog context for creating the adapter.

Bug: 18509286
Change-Id: Ia5791a6283723a0ab458f24ec22b8890ab627657
2014-12-03 14:20:05 -08:00
Maurice Lam
ec957dfcf7 am 2ecc0107: am 94c85309: am 7b484b9a: Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev
* commit '2ecc0107dcc939bd4e3b9f4c4359f9845cae1b82':
  [FRP] Theme interstitials for lock screen setup
2014-12-03 21:52:23 +00:00
Maurice Lam
ecd2b7b81f [FRP] Theme interstitials for lock screen setup
Use the setup wizard theme for EncryptionInterstital and
RedactionInterstitial as they will show during the lock screen setup
as part of setup wizard.

Bug: 18482708
Change-Id: I65c8924952345a4e17fcf4ffb7d68df53244c5d7
2014-12-01 20:24:08 -08:00
Maurice Lam
fcdc4dd32c am 72b29f9b: am 86f184b3: am 6b19fa90: [FRP] Theming for Pattern and Password screens
* commit '72b29f9b7f6e9a0c0b9f8313df8897b29481292e':
  [FRP] Theming for Pattern and Password screens
2014-12-02 01:35:45 +00:00
Maurice Lam
6b19fa9017 [FRP] Theming for Pattern and Password screens
Basic theming for pattern and password screens. Create subclasses for
ChooseLockPassword and ChooseLockPattern, and copied their XML
layouts.

This CL mainly uses the buttons in the original screens as-is, with a
follow-up CL coming to change to use the nav bar buttons.

Bug: 18482708
Change-Id: I81751f781de633aff23fc68657589360007c235a
2014-12-01 16:18:27 -08:00
Sanket Padawe
1eb838ec83 am 626d1fc0: am c7e62cf1: am cd1846fa: Merge "Changing hint string inside sim name editor dialog in settings." into lmp-mr1-dev
* commit '626d1fc0f78aa634778b7cc1ac860c35f6a83213':
  Changing hint string inside sim name editor dialog in settings.
2014-11-22 00:00:30 +00:00
Sanket Padawe
cd1846fa6b Merge "Changing hint string inside sim name editor dialog in settings." into lmp-mr1-dev 2014-11-21 23:32:51 +00:00
Zoltan Szatmary-Ban
2a7a9f6b9e am ead7991d: am 548460bd: Merge "Show managed profile accounts on Settings > Factory Reset" into lmp-mr1-dev automerge: 72b1985
* commit 'ead7991dead5f2c5886778ac4d9b31f0ac300101':
  Show managed profile accounts on Settings > Factory Reset
2014-11-20 21:29:12 +00:00
Zoltan Szatmary-Ban
548460bda5 Merge "Show managed profile accounts on Settings > Factory Reset" into lmp-mr1-dev 2014-11-20 14:06:14 +00:00
Sanket Padawe
d0c0a479b0 Changing hint string inside sim name editor dialog in settings.
Chaning hint string from "Enter SSID" to "Enter SIM name" inside sim name
editor dialog in sim settings.

Bug: 18455476
Change-Id: I3ac58e23a23d6afa31b84ec1296623e0443f3cff
2014-11-19 16:50:28 -08:00
Sanket Padawe
d1cb0d3805 am 1115d938: am 1ec6807a: am d85aa178: Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev
* commit '1115d93887de1b758fa120dc9a4caa7278dd4a96':
  Adding icons to sim color selection in settings UI.
2014-11-18 20:17:51 +00:00
Sanket Padawe
d85aa17894 Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev 2014-11-17 23:53:13 +00:00
Sanket Padawe
a8bd025d35 Adding icons to sim color selection in settings UI.
Adding icons to sim color selection of sim settings UI.

Bug: 18380838
Change-Id: I98f07721aa234ff58a64a0c694206b085385bdec
2014-11-17 10:43:37 -08:00
PauloftheWest
74866c8634 am 5cf2b43f: am de16eb6e: am acb160ba: Merge "Added tabs for Multi-SIM SIM Lock." into lmp-mr1-dev
* commit '5cf2b43f914fa3268d1adf8abace74f34d651baf':
  Added tabs for Multi-SIM SIM Lock.
2014-11-17 16:23:47 +00:00
PauloftheWest
acb160baa3 Merge "Added tabs for Multi-SIM SIM Lock." into lmp-mr1-dev 2014-11-17 16:12:44 +00:00
John Spurlock
28b826a7da am 94ad9981: am fdebfc35: Settings: Add effects suppression text to Ring volume. automerge: d099aa6
* commit '94ad99814abfd1822b1597ddb4068fbc838e0123':
  Settings: Add effects suppression text to Ring volume.
2014-11-14 23:00:57 +00:00
John Spurlock
fdebfc35c4 Settings: Add effects suppression text to Ring volume.
If the effects are being muted by a notification listener, display
a "Muted by <x>" msg instead of an active slider inside the
Ring/Notification volume setting pref.

Update volume pref design to optimize for this new custom appearance.

Depends on frameworks/base:
  Icdb5f85eb4bcaa1ead7d77c1460e06ad3f0604d5

Bug: 17461563
Change-Id: I6da871e16009370402451a2ff507de4762644a80
2014-11-14 14:38:03 -05:00
PauloftheWest
1d891b4caa Added tabs for Multi-SIM SIM Lock.
Bug: 18147652
Change-Id: I89d3ffb0b1451d263d7c913ac210d52d5308f3c0
2014-11-14 10:38:43 -08:00
PauloftheWest
3dc6c4e6f3 am f95f2590: am 0f4254fa: am 26104298: Merge "Adding Sim Status menu to Settings." into lmp-mr1-dev
* commit 'f95f2590c1ea6023c9c88d6fb031d622a609df2a':
  Adding Sim Status menu to Settings.
2014-11-14 00:43:19 +00:00
PauloftheWest
26104298eb Merge "Adding Sim Status menu to Settings." into lmp-mr1-dev 2014-11-13 13:57:09 +00:00
Sanket Padawe
6d795b9161 am 2856fb31: am f722ff93: am 6416bec0: Merge "UI changes for icons in sim settings" into lmp-mr1-dev
* commit '2856fb31e8b573b54f8064941795efcd8a9324bd':
  UI changes for icons in sim settings
2014-11-13 02:13:26 +00:00
PauloftheWest
76b0801173 Adding Sim Status menu to Settings.
+ Added tabs for Multi-SIM devices.
+ Most of the code was taken from MediaTek
(https://partner-android-review.googlesource.com/#/c/181417)

Bug: 18195254
Change-Id: If6f7d5cfa4d41adb52dfc1bd035b4ff79d926bd8
2014-11-12 14:52:18 -08:00
Sanket Padawe
0381f6c675 UI changes for icons in sim settings
+ UI changes relate to displaying sim icons in sim settings
+ Correcting way to display phone number inside sim settings dialog

Bug: 18356419
Change-Id: I1fe025fac52f20b607d4492b99cfef9588ec9416
2014-11-12 12:41:35 -08:00
Zoltan Szatmary-Ban
7cc1b9e63e Show managed profile accounts on Settings > Factory Reset
List both primary profile's and managed profile's accounts. Also notify the user
if there are other users present on the device.

Bug: 17899181
Change-Id: I5401722e65305861edeed60cfe926fca5c81a418
2014-11-12 01:18:29 +00:00
Jason Monk
cbf1d5d0dc am dac36faf: am cc0a2c55: Merge "Screen pinning: fix strings and add scrollview" into lmp-mr1-dev
automerge: 0ae5f60

* commit '0ae5f6037b68794dc8a394c24a6ec8413c97555f':
  Screen pinning: fix strings and add scrollview
2014-11-07 17:18:40 +00:00
Jason Monk
cc0a2c554a Merge "Screen pinning: fix strings and add scrollview" into lmp-mr1-dev 2014-11-07 16:58:37 +00:00
Jason Monk
d570e9839e Screen pinning: fix strings and add scrollview
Update strings as requested from ewong, and add scrollview around
description for large-text/small-device case.

Bug: 18287056
Bug: 17177672
Change-Id: Ie34007d263a1fbc77fc8f435dbcd23a36f1766c3
2014-11-07 11:46:33 -05:00
Alexandra Gherghina
eb320d2bad am 6f8019d8: am fcb880c6: am ee70c699: Merge "Update text for apps installed for other users" into lmp-mr1-dev
* commit '6f8019d8891095cce375ce7f7ebbf3ad8ba6d57c':
  Update text for apps installed for other users
2014-11-07 10:48:43 +00:00
Alexandra Gherghina
ee70c69919 Merge "Update text for apps installed for other users" into lmp-mr1-dev 2014-11-07 10:35:38 +00:00
Alexandra Gherghina
d9ed84375d Update text for apps installed for other users
This also refactors the layout to accommodate longer text

Bug: 16364316
Change-Id: I41eacba5b09a4f13af9695594c1a53eae075554f
2014-11-07 10:05:49 +00:00
Jeff Davidson
568d156089 am 0fc9271b: am c4a68608: am 99f191f5: Remove the Wi-Fi Assistant card.
* commit '0fc9271b21b46b6972dcf0e976d20605042b0b38':
  Remove the Wi-Fi Assistant card.
2014-11-07 04:12:59 +00:00
Jeff Davidson
99f191f585 Remove the Wi-Fi Assistant card.
Per the latest mocks, advanced wireless settings will be the only
location in platform settings where Wi-Fi Assistants are configured.
The card is no longer being used.

Bug: 13780935
Change-Id: Idddf971404532256165045665bd0a6b19966d2bd
2014-11-06 13:30:34 -08:00