Commit Graph

605 Commits

Author SHA1 Message Date
Sanket Padawe
907990dbc5 Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev automerge: 4decadb automerge: c1af278
automerge: 2493118

* commit '2493118a3ca150bdb94d87dda17e7b3bd3940af7':
  Remove SimDialogActivity from recents app list.
2015-02-03 18:24:42 +00:00
Sanket Padawe
ffd96559e7 Remove SimDialogActivity from recents app list.
Bug: 19237301
Change-Id: I09f12c16e5afc0058f19f92ffbfd930fa099fd9b
2015-02-02 16:46:55 -08:00
Fyodor Kupolov
19280af592 Use primaryUserOnly attribute to disable CryptKeeper
CryptKeeper activity is now disabled by using primaryUserOnly, instead of
broadcast receiver. This allows to avoid bringing up the process, when it
is not necessary.

Change-Id: I5d1f979b96093c6769f6c920b18517971835a7ad
2015-01-27 12:07:16 -08:00
Maurice Lam
50f2081f6b am 1cca45bc: Merge "[WifiSetup] Don\'t pan the window for IME" into lmp-mr1-dev automerge: ff649c6 automerge: a1f6660
* commit '1cca45bc6e12a04ce6bde0e5b1c56933869cf9d8':
  [WifiSetup] Don't pan the window for IME
2015-01-20 21:49:49 +00:00
Maurice Lam
98f245069b [WifiSetup] Don't pan the window for IME
Suppress panning the activity window for the IME because that is
causing garbage to be drawn.

Bug: 18974000
Change-Id: I42429241425be0e520e9b36d1e134748ae583076
2015-01-15 11:55:15 -08:00
Amith Yamasani
9f0eaf19b3 am 0eda0765: am 43bdc5cd: am 10fb4f80: Merge "Fix theme for empty activity" into lmp-mr1-dev
* commit '0eda07657aad4a05d50896410ab56b48570e7d57':
  Fix theme for empty activity
2015-01-05 21:10:11 +00:00
Amith Yamasani
39fb062795 Fix theme for empty activity
Avoids janky transition when confirmation of device credential
is requested.

Bug: 18637426

Change-Id: I3645e180e50f570d6d09d649978064fa5adf7755
2014-12-18 10:22:02 -08:00
Fyodor Kupolov
c7f09da972 Merge "Disable CryptKeeper activity for secondary users" 2014-12-17 21:22:11 +00:00
Jason Monk
2e904fdd28 am c0ecaeef: am 5aaa4b63: am b0c8c393: Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-dev
* commit 'c0ecaeefe8d22c8dbd77c51090cb55e1c448b983':
  Add a periodic check of the tethering provisioning
2014-12-16 17:11:29 +00:00
Jason Monk
b0c8c3935d Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-dev 2014-12-16 15:44:27 +00:00
Fyodor Kupolov
1b5cc427f0 Disable CryptKeeper activity for secondary users
For secondary users, disable CryptKeeper activity in a broadcast receiver of
USER_INITIALIZE intent. This change has the following benefits for guest
user switching:
 - The code will be executed earlier in the user switching flow, when the
   screen is frozen by WindowManager.
 - Initialization of CryptKeeperActivity is skipped

Bug:18670536
Change-Id: I60300198b605c26ad15afe2c874d5f1be7da5087
2014-12-16 02:48:36 +00:00
Maurice Lam
6efd692ffd am befc1267: am 4e8a7219: am 8e0929a3: Merge "[FRP] Open the lock setup screens in same task" into lmp-mr1-dev
* commit 'befc1267a59b4b412b86babedaa4f6727fa239a0':
  [FRP] Open the lock setup screens in same task
2014-12-15 22:03:39 +00:00
Maurice Lam
56e6cf5565 [FRP] Open the lock setup screens in same task
Set the taskAffinity of of the lock setup screens so that the
transitions behave correctly.

Bug: 18724458
Change-Id: Ibca7adfad1e5bd07c7e7d2e1beb279c5e57ac735
2014-12-11 18:22:08 -08:00
Jason Monk
37832d661a Add a periodic check of the tethering provisioning
Add a service that handles the check through broadcasts which are
defined through configs, similar to the previous configs for the
activity.

Depends on I1f6e2d954562c5a16a0de60dac625005ec3e5c50

Bug: 18453076
Change-Id: I515d72706e9ca37877e67c44427af1b75b146390
2014-12-11 15:07:45 -05:00
Lucky Zhang
a62e42be14 am 90ec22bc: am 07117147: Merge "[FRP] Screen Lock for Setup Wizard shows wrong title" into lmp-mr1-dev
automerge: 44f44a0

* commit '44f44a0c54a8467307b55f244866e67bf48d3d62':
  [FRP] Screen Lock for Setup Wizard shows wrong title
2014-12-09 23:15:37 +00:00
Sanket Padawe
8b8ae61d52 am 088a4420: am 32fc9755: am fc988c03: Merge "Removing checks from EnableWifiTether which are done in SystemUI" into lmp-mr1-dev
* commit '088a44205d2b4a7c2add44f9109f209b50c0f3b9':
  Removing checks from EnableWifiTether which are done in SystemUI
2014-12-09 00:55:48 +00:00
Justin Harrison
15f8bf6278 am de54a3ae: am 9704e3d6: am 03cceb32: Merge "Removed the application SIM Cards from application list" into lmp-mr1-dev
* commit 'de54a3aef60f2d3d1f143ba5bb1ecdd4b9cf3a9e':
  Removed the application SIM Cards from application list
2014-12-09 00:55:39 +00:00
Lucky Zhang
36ec274e73 [FRP] Screen Lock for Setup Wizard shows wrong title
Changed to the string lock_setting_picker_title that says "Choose a
screen lock".

Bug: 18631416
Change-Id: I2e400f3fdf7e89d4e70a60e1aec6df9ed77653b2
2014-12-05 18:20:27 -08:00
Sanket Padawe
fc988c03e1 Merge "Removing checks from EnableWifiTether which are done in SystemUI" into lmp-mr1-dev 2014-12-05 20:55:43 +00:00
PauloftheWest
2b2019255e am 753a00e0: am 06ddf97c: am e8a868f2: Merge "Add SIM notification pop-ups." into lmp-mr1-dev
* commit '753a00e057201ad319bf85487beb1c6329bf1a05':
  Add SIM notification pop-ups.
2014-12-05 00:14:10 +00:00
PauloftheWest
62297eac1d Removed the application SIM Cards from application list
Bug: 18623155
Change-Id: Ic9ef449136fb6ef854727ad994976a5dc6d8ee8c
2014-12-04 12:32:40 -08:00
Sanket Padawe
232b0e4e67 Removing checks from EnableWifiTether which are done in SystemUI
Bug: 18368949
Change-Id: Ib80e7b4adaf4d5fb6029bbee0f6fdf5a99e18018
2014-12-04 12:10:15 -08:00
PauloftheWest
e8a868f266 Merge "Add SIM notification pop-ups." into lmp-mr1-dev 2014-12-03 23:30:53 +00:00
Sanket Padawe
3bbfa7b355 am 3bae7245: am 5fe69a2c: am 97c65a5e: Merge "New activity for enabling tethering using Quick Settings" into lmp-mr1-dev
* commit '3bae72459f352b60893955a5b3c23614ca9c8403':
  New activity for enabling tethering using Quick Settings
2014-12-03 21:52:28 +00: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
Sanket Padawe
97c65a5ee6 Merge "New activity for enabling tethering using Quick Settings" into lmp-mr1-dev 2014-12-03 01:34:00 +00:00
PauloftheWest
ffef98b3a0 Add SIM notification pop-ups.
+ Added a SimDialogActivity so any application can iniate a request to
se tthe default Data, Calls, and SMS.

Bug: 18293625
Change-Id: I60535125b40ece5ebc14542d732e4493bddefbae
2014-12-02 16:35:32 -08:00
Sanket Padawe
bcbe980986 New activity for enabling tethering using Quick Settings
Added a new activity which would handle tethering on clicking Tethering
tile of Quick Settings.

Bug: 18368949
Change-Id: I77057f3ccd26263831ba88e426b5f8d3ad1fa788
2014-12-02 09:45:35 -08: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
Maurice Lam
66e911fb02 am edfc6a0a: am 628e89e9: am 3f9d8b60: Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev
* commit 'edfc6a0a5fb4d371272e4b4c80de22c4ff346214':
  [Setup] Theme ChooseLockGeneric for setup wizard
2014-11-26 19:56:48 +00:00
Maurice Lam
52c75baa12 [Setup] Theme ChooseLockGeneric for setup wizard
This is step one of theming the set-up lock screen flow to match the
setup wizard theme. This shows the general approach of creating a
subclass of both the activity and fragment and overriding methods to
achieve the desired behavior for setup.

ag/594000 is a much more comprehensive change for what the final
change will look like.

Bug: 18482708
Change-Id: Idff34937f39f46a0c488df2cae4c46155b80cab7
2014-11-25 16:52:10 -08:00
PauloftheWest
ed6cf9c191 am 5f0da57c: am a41e40ec: am 79381a92: Merge "Created Multi-SIM notifications." into lmp-mr1-dev
* commit '5f0da57c651571e89cb87160f3eebe0945eca1da':
  Created Multi-SIM notifications.
2014-11-18 20:17:50 +00:00
PauloftheWest
79381a928b Merge "Created Multi-SIM notifications." into lmp-mr1-dev 2014-11-17 22:50:08 +00:00
Jeff Sharkey
06fc055bfa am 989f8a11: am c88cdea2: Merge "Migrate license display to HTMLViewer." into lmp-mr1-dev automerge: f685335
* commit '989f8a11b2852ff818a6839642db1661606fb549':
  Migrate license display to HTMLViewer.
2014-11-14 21:55:40 +00:00
Jeff Sharkey
c88cdea2bb Merge "Migrate license display to HTMLViewer." into lmp-mr1-dev 2014-11-14 19:24:43 +00:00
Jeff Sharkey
e16e44f756 Migrate license display to HTMLViewer.
For security purposes, we're no longer allowing WebView to be loaded
when running as system UID.  Instead, we now launch HTMLViewer to
show the details.

Bug: 18376908
Change-Id: I3c6a7897ab4ad0fc2c5463e5d69c7f53fb934e31
2014-11-14 09:46:33 -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
63f7bc87d8 Created Multi-SIM notifications.
+ On Multi-SIM devices a notificaiton will pop up when a SIM card is
added, removed, or replaced.
+ The notification informs the user there has been a change in SIMs and
they can tap the notification to go SIM Card Settings.

Bug: 18293625

Change-Id: Iad1e5e0cf469e7bdfc43b2c18dd0586d042bb784
2014-11-13 15:05:02 -08: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
PauloftheWest
9d5a324279 am 109ca52c: am 22f257b0: am 93c10334: Merge "Added IMEI status activity." into lmp-mr1-dev
* commit '109ca52c67c90d15c98cd3634035d0526f906e5b':
  Added IMEI status activity.
2014-10-30 11:06:53 +00:00
PauloftheWest
f41aaa249b Added IMEI status activity.
+ Added IMEI support from MTK with formatting changes.  Now extra SIM
  IMEI information is displayed in a seperate activity.

Bug: 17935115
Change-Id: I48942d77650bef2a1778996db3b1ec3a9d87492c
2014-10-28 13:00:11 -07:00
Jim Miller
69cb6a9001 am f38b63c9: am f3e5611c: am 1d050220: am 3ef52587: resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev
* commit 'f38b63c9137ac1eb11e30ff03553c88696813ec0':
  Add a checkbox option to 'require password to decrypt'
2014-10-15 21:23:51 +00:00
Jim Miller
46c7f6d6f3 Add a checkbox option to 'require password to decrypt'
Fixes bug 17881324

Change-Id: I3f256f448a35cf8104ee6acb4de253874101f7c0
2014-10-14 18:40:30 -07:00
Sky Faber
2d657e3629 Separate wifi AP added by applications.
-Add permission to allow settings to modify all wifi APs
-Add option to show AP owners.

Change-Id: I12943563ef714c4287e13488578f020d136d006d
2014-09-27 02:00:36 +00:00
Maurice Lam
795511ec9c [WifiSetup] Disable app starting window
Disable the app starting window when start WifiSetupActivity so that
there will not be a blank black screen the first time this activity
is started.

Bug: 17457465
Change-Id: I4fa019a603a088d458fa9bcf126364fbb49b1b1f
2014-09-15 11:40:34 -07:00
Paul Lawrence
5ab67c5648 Prevent PIN/Passwword disappearing during boot
During startup, when the telephony service starts, a configChange is sent
to the CryptKeeper activity, causing it to lose its data.

Ignore this change since it is immaterial to what we display.

Bug: 17421115

Change-Id: I83f867f3de5d90ff1050e3906da142d99fd6c276
2014-09-12 12:35:18 -07:00
Alexandra Gherghina
edbfedf58f Merge "Splits out ACTION_MAIN intent filter for Settings and doesn't forward it." into lmp-dev 2014-09-08 19:13:10 +00:00
Barnaby James
3c6f7a3339 Merge "Remove intent filter for Airplane mode voice activity." into lmp-dev 2014-09-05 19:59:21 +00:00