Commit Graph

24545 Commits

Author SHA1 Message Date
Xiaohui Chen
dbf3e15207 Make FallbackHome lower priority.
This makes SystemUserHomeActivity, which also has a low priority,
works properly for system user.

Bug: 26358655
Change-Id: If07b39ac5a7015805ac22a968b3d704aaad80012
2015-12-30 15:51:56 -08:00
Alex Cheung
25ac0502b0 Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276 2015-12-23 17:06:20 -08:00
Nick Kralevich
bb60fe9f06 Merge "Hide usb mode chooser dialog after disconnected" am: b913bf926e
am: 6556921a1e

* commit '6556921a1edbddea64b54415967b2bacbb7bf456':
  Hide usb mode chooser dialog after disconnected
2015-12-23 11:01:05 -08:00
Nick Kralevich
6556921a1e Merge "Hide usb mode chooser dialog after disconnected"
am: b913bf926e

* commit 'b913bf926e04280d0864cc36c759eddf88cf8b21':
  Hide usb mode chooser dialog after disconnected
2015-12-23 10:58:56 -08:00
Nick Kralevich
b913bf926e Merge "Hide usb mode chooser dialog after disconnected" 2015-12-23 18:55:09 +00:00
Philip P. Moltmann
66626910b3 Merge "Use new getIcon and getMoreInfo api to show more information in Print Settings" 2015-12-22 21:49:29 +00:00
Svetoslav
6a8b04479b DO NOT MERGE Modify system settings: incorrect UI state am: 119d589ea5 am: 6e88d0b02f
am: 58d5d785ca  -s ours

* commit '58d5d785ca68b008f0e410cdf1ab2fe55f38ada5':
  DO NOT MERGE Modify system settings: incorrect UI state
2015-12-22 19:46:06 +00:00
Svetoslav
58d5d785ca DO NOT MERGE Modify system settings: incorrect UI state am: 119d589ea5
am: 6e88d0b02f

* commit '6e88d0b02f48d8b4c87f197ccca927373df99758':
  DO NOT MERGE Modify system settings: incorrect UI state
2015-12-22 11:44:00 -08:00
Svetoslav
6e88d0b02f DO NOT MERGE Modify system settings: incorrect UI state
am: 119d589ea5

* commit '119d589ea5aa9c2ccc5164279d718a20d0865f20':
  DO NOT MERGE Modify system settings: incorrect UI state
2015-12-22 19:42:06 +00:00
Svetoslav
119d589ea5 DO NOT MERGE Modify system settings: incorrect UI state
The privilege for an app to write to the system settings is protected
by an app-op signature permission. App-op permissions are special: if
the app-op is deny/allow we deny/allow write access; if the app-op is
default holding the permission determies write access. The settings
code assumes that CHANGE_NETWORK_STATE is an app op permission
(system|appop) while it is a normal permission which any app gets by
declaring it used in the manifest.

The side effect is that the state of the toggle in the UI for write
system settings will initially be in the wrong state if the app uses
both WRITE_SETTINGS and CHANGE_NETWORK_STATE. However, the code in
the public API an app uses to check write settings access would return
the opposite since it checks the WRITE_SETTINGS permission and its
app op. Hence, if an app requires write settings to start the user
will see in the settings UI it has access but the app will not have
access, so the app would prompt the user to allow write settings.
The non-obvious fix is for the user to toggle the setting off and on
to get the app op in the right state and be able to launch the app.

bug:25843134

Change-Id: I3d726a66c7f9857bc7dbd5946fdbb8f340c6eb4d
(cherry picked from commit 356fb2d10d)
2015-12-22 19:38:30 +00:00
Du, Changbin
93df36a1c7 Hide usb mode chooser dialog after disconnected
Add a UsbDisconnectedReceiver to listen usb state event, and hide
the usb mode chooser dialog if usb disconnected.

Change-Id: I871f56cb5a310e20950926180d9747dd9fad9754
Signed-off-by: Du, Changbin <changbin.du@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
2015-12-22 15:26:13 +08:00
Jack Yu
e6479d5785 DO NOT MERGE - Added a new broadcast receiver to handle Brzail channel 50 area info
Moved the area info handler from CellBroadcastReceiver to
CellBroadcastAreaInfoReceiver.

bug: 25628456
Change-Id: I2c7c6bb83245fcb6d9cc7b5dce7496e906160bab
2015-12-21 22:33:50 +00:00
Udam Saini
44b1e0ed99 Merge "Fixes password not being saved on orientation changed." 2015-12-21 21:19:03 +00:00
Jack Yu
c58c05bff9 Merge "Added a new broadcast receiver to handle Brzail channel 50 area info" 2015-12-21 19:47:42 +00:00
Udam Saini
0ec68624f7 Fixes password not being saved on orientation changed.
We are now using the same configuration as WifiSettingsActivity,
which also uses the same configChanges parameters. This keeps the
Setup Wizard instantiation of WifiDialog and the settings instantiation
closer together.

bug:26220180
Change-Id: I05e692d6cb81d3765a3de4ccd6c074deffada72e
2015-12-21 10:52:34 -08:00
Felipe Leme
88c8aad710 Merge "Changed dialog shown from "Take Bug Report" to display 2 options:" 2015-12-21 17:58:09 +00:00
Philip P. Moltmann
7fdf34194b Use new getIcon and getMoreInfo api to show more information in Print
Settings

Also fix some text color of the printer list.

Bug: 24135005
Change-Id: I3c387e1277b2a7f09574d42cfe29cc03dd8ef8d5
2015-12-21 09:38:13 -08:00
Philip P. Moltmann
79161827ae Merge "Print-Settings Remove unused fields." 2015-12-21 17:27:43 +00:00
Felipe Leme
834496f7fc Changed dialog shown from "Take Bug Report" to display 2 options:
* Normal Report: the new, enhanced option is more user-friendly (it
  shows a system notification with the progress, allow user to cancel,
  etc...), at the cost of consuming more resources. When this option is
  selected, the bugreport will be delayed 2 seconds so user can dismiss
  the Settings app before a screenshot is taken.

* Emergency Report: a lighter approach that is less intrusive and
  should be use when the phone is unresponsive or too slow.

BUG: 26034608
BUG: 11665244

Change-Id: If9c0242a163c8c33adecfc8a65af561e839bab8d
2015-12-21 08:15:17 -08:00
Jeff Sharkey
bc16a07c93 Gracefully handle slowly appearing Home apps.
When starting a Guest user for the first time, it can take quite
awhile before the Home app enables itself.  So if we're unlocked
and no other Home app is around, chill for 500ms and see if someone
showed up.

Bug: 26267450
Change-Id: I3c4e01ae3681c650ea90b20ffc21835ae264b5e9
2015-12-18 18:40:33 -07:00
Philip P. Moltmann
cb9deb035b Print-Settings Remove unused fields.
Change-Id: I2f48c7bb54ab960178a8b7858f8accfe34107d7d
2015-12-18 14:02:52 -08:00
Mihai Nita
7104376692 Modify "Language & Input" for two steps selection: language, then region
The picker in frameworks/base does the simpler job: when called it
returns one locale only, no knowledge of locale lists.

The previous com.android.internal.app.LocalePicker shows a list of
locales based on the localised resources available.

The replacement (LocalePickerWithRegion) shows a more complete list
(a curated subset of all the ICU locales, but still pretty big).

Because of the length of the list the LocalePickerWithRegion splits the
selection in two: you first select the language, and then the region
(where that language is used).

If you need to select one of the locales completely supported by the
system (that have translated UI), continue to use
com.android.internal.app.LocalePicker

They should be compatible: they show some UI and end up selecting a
locale.
Beyond the UI differences, LocalePickerWithRegion will return more
"granular" locales (tens of French, or Spanish, or English locale
 variants).

Bug: 25800339
Change-Id: I0371d82302b462b1a633c149df08a39b6d508f58
2015-12-18 21:14:22 +00:00
Julia Reynolds
df01cde11c Conditionally show settings.
Change-Id: I8e62ed6e2515b76de73d3d25adcfb121f809c646
2015-12-18 15:50:05 -05:00
Gustav Sennton
63196c5f82 Merge "Add null-pointer check for the case where we have no WebView provider." 2015-12-17 18:04:37 +00:00
Alan Viverette
5e044fb620 Merge "Localization clarifications" 2015-12-17 17:45:36 +00:00
Jason Monk
24718b8dc6 Merge "Fix the build" 2015-12-17 16:38:36 +00:00
Jason Monk
67d36c4074 Fix the build
Change-Id: I4d8b039a68042d022db82668a8c6a78967e351e5
2015-12-17 11:37:26 -05:00
Alan Viverette
003774bd04 Localization clarifications
Bug: 26223525
Bug: 26222163
Change-Id: I273d0452d26cfe4ec0e23a8455cda958dfcf26bb
2015-12-17 10:52:13 -05:00
Jason Monk
5d0bdb9d90 Merge "Fix search highlighting items" 2015-12-17 15:47:01 +00:00
Gustav Sennton
6ced4c95f5 Add null-pointer check for the case where we have no WebView provider.
Change-Id: I33a142bd3af694dfe9c63e6852a6b5cd701de467
2015-12-17 15:44:16 +00:00
Jason Monk
65bb097732 Fix search highlighting items
Bug: 24576551
Change-Id: I0a6c251cc93eef9f49070f2b7e57780d4542dd03
2015-12-17 10:39:44 -05:00
Julia Reynolds
2ba71ad15d Don't show orphaned rule instances in Settings.
Bug: 25472361
Change-Id: Ic9bec4872777b720aa786679cbc960a9ee51dbe1
2015-12-17 08:46:09 -05:00
Jason Monk
fa4813783f Avoid RecyclerView causing items to blink on update
Change-Id: Ic0bd70ec3f2a5e195cc0924c98c589f90e27afe9
2015-12-16 16:43:02 -05:00
Jason Monk
b1dd5c9959 Fix Settings Titles not being set correctly
Bug: 25585359
Change-Id: I523a00115295adb9f43de768bb40c02099ffb1af
2015-12-16 16:13:54 -05:00
Jason Monk
aca0f1cf8a Fix airplane mode conditional primary click
Change-Id: Iacd83b53be224ad8fd55fe176f66a0d724576247
2015-12-16 15:58:59 -05:00
Jason Monk
77d57d07a9 Protect against crash when no NfcAdapter is around
Bug: 26155716
Change-Id: I9e10831ca068263b40fcf06bf83ce341d73e96d2
2015-12-16 14:26:18 -05:00
Jason Monk
c685853bb8 Add background data off conditional
Change-Id: If51fdaecc880560c4a0cd8d320b06804cfe98388
2015-12-16 12:58:39 -05:00
Jason Monk
70ecea2207 Add cellular data off conditional
Change-Id: I34980f3fc09bf5dd47eb296c5b1c5fccc87b5c90
2015-12-16 12:42:22 -05:00
Jason Monk
af24b6377e Add battery saver conditional
Change-Id: If80b749185537f252dae88230f80b29bcf321fdf
2015-12-16 12:38:32 -05:00
Amit Mahajan
cd74ebb53d Code cleanup including removing direct references to IMS classes.
Bug: 25793157
Change-Id: I15f285a03ce65695ac260945993fbd189ba3b5d0
2015-12-15 16:43:32 -08:00
Amit Mahajan
29d3b16fc4 Merge "Code cleanup including removing direct references to IMS classes." 2015-12-15 23:50:22 +00:00
Maurice Lam
0f5860c9a0 Merge "[ScreenLock] Fix result code handling" 2015-12-15 22:20:47 +00:00
Maurice Lam
e9d2abca86 [ScreenLock] Fix result code handling
Modify the back stack and result code propagation in the screen lock
scenarios.

- EncryptionInterstitial now propagates the result of ChooseLock*
  request instead of always returning RESULT_OK.
- ChooseLockGeneric now treats CHOOSE_LOCK_REQUEST and
  ENABLE_ENCRYPTION_REQUEST the same (since encryption can be a proxy
  for ChooseLock*). This means ChooseLockGeneric will now stay on
  back stack when going back from ChooseLock*, just like the case
  (indirectly) through EncryptionInterstitial.

Bug: 26177240
Change-Id: Id7f1256dcbff00d552a3e7db60c285f53f1e63e6
2015-12-15 11:56:45 -08:00
Jason Monk
b69b96042c Merge "Move DropDownPreference to supportlib" 2015-12-15 18:02:53 +00:00
Jason Monk
1230ac820e Move DropDownPreference to supportlib
Change-Id: Ife6799d1136302b805b5191f1a86276c538ca4bf
2015-12-15 10:59:08 -05:00
Alan Viverette
4582dab08e Merge "Allow use of comma to separate search keywords, update keywords" 2015-12-15 15:24:53 +00:00
Alan Viverette
35c3454808 Allow use of comma to separate search keywords, update keywords
Bug: 26149710
Change-Id: I2d8095bbb007c011d7b3e2fe077115c696f9e39c
2015-12-15 09:50:44 -05:00
Clara Bayarri
c5cde05562 Fire pending intent from Confirm Credentials flow
Add support in the Confirm Credentials flow to read an Intent extra
and fire it when authentication succeeds.

This is part of the Separate Work Challenge feature.

Change-Id: I52c203735fa9b53fd2f7df971824747eeb930f36
2015-12-15 10:45:48 +00:00
Jim Miller
990c08e3af Merge "Fix blank animation in "find the sensor" flow for fingerprint." 2015-12-15 04:08:30 +00:00
Jim Miller
931901186a Fix blank animation in "find the sensor" flow for fingerprint.
Fixes bug 26194530

Change-Id: I855b6f12a72c7489fae8fba249c55d4626b4a202
2015-12-14 20:01:42 -08:00