Commit Graph

25070 Commits

Author SHA1 Message Date
Amith Yamasani
a44b4feed4 Merge "Fix "division by zero" crash after USB mass storage disconnects" 2016-01-05 00:26:43 +00:00
Nathan Harold
d8cf66ef73 Merge "Fix Resource Reference to radio_info_ping_hostname" 2016-01-04 23:55:59 +00:00
Nathan Harold
12e6856c61 Fix Resource Reference to radio_info_ping_hostname
Bug: 26386182
Change-Id: If1204ab9e2c255995c418babed2096dc9c815345
2016-01-04 15:27:32 -08:00
Julia Reynolds
0c4052ceaa Merge "Allow users to choose a notification assistant." 2016-01-04 22:07:28 +00:00
Julia Reynolds
2e1e0b7ef6 Allow users to choose a notification assistant.
Change-Id: Iddfbfedbb6a3aae246058ff41324dc06852484cb
2016-01-04 16:36:56 -05:00
Jeremy Klein
78d182f8d8 Use the new TETHER_PRIVILEGED permission.
BUG: 26247383
Change-Id: Iaec7a1095c18cfd9bcf83ebd63e02462dcf38c61
2016-01-04 11:19:32 -08:00
Xiaohui Chen
e5eb083415 Merge "Make FallbackHome lower priority." 2016-01-04 17:21:16 +00:00
Sudheer Shanka
e3e1961f5e Merge "Rename the intent for ShowAdminSupportDetailsDialog again." 2016-01-04 15:49:20 +00:00
Jorim Jaggi
292b9fd2da Add developer option for freeform window support (2/2)
Also disable default force-resizable on non-user builds.

Bug: 25276672
Bug: 24815256
Change-Id: I26b04d73bc605da903993084ad171c42a64f0bb2
2016-01-04 15:58:18 +01:00
Jason Monk
ae969d7197 Merge "fix out of memory with continuous entry and exit InstalledAppDetail." am: d298d474e6
am: dfc6e32434

* commit 'dfc6e32434a0d208403f8ce754e079e77e34cf7f':
  fix out of memory with continuous entry and exit InstalledAppDetail.
2016-01-04 14:44:25 +00:00
Jason Monk
dfc6e32434 Merge "fix out of memory with continuous entry and exit InstalledAppDetail."
am: d298d474e6

* commit 'd298d474e620766b4308376525ef6a2730bbb299':
  fix out of memory with continuous entry and exit InstalledAppDetail.
2016-01-04 14:42:31 +00:00
Jason Monk
d298d474e6 Merge "fix out of memory with continuous entry and exit InstalledAppDetail." 2016-01-04 14:39:38 +00:00
daqiangx
2396a40c90 fix out of memory with continuous entry and exit InstalledAppDetail.
A session keeps in ApplicationsState list. The fragment don't release
the session when it is destroyed. The cause of out of memory is that the
session list is increased, but it can't be released.

Change-Id: I23635610c9fdfb8a3423299a91cf9b11cb5cdb65
Signed-off-by: daqiangx <daqiangx.li@intel.com>
2016-01-04 13:40:28 +08:00
Sudheer Shanka
cb99d94c78 Rename the intent for ShowAdminSupportDetailsDialog again.
Change-Id: I0ffb353e8b131a5bc8a570f271118e19348a4b3a
2015-12-31 17:46:29 +00:00
Sudheer Shanka
3f19085f1c Rename the intent for ShowAdminSupportDetailsDialog.
Change-Id: Ie3aecedaedfb3feecb384bf1b9f73aa54077b071
2015-12-31 14:58:02 +00:00
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
Mark Salyzyn
87a3c6fee7 resolve merge conflicts of 94ab88228e to master.
NB: packages/apps/Settings/res/values/arrays.xml new content
moves to frameworks/base/packages/SettingsLib/res/values/arrays.xml.

Bug: 26178938
Change-Id: Ib241baac7807914447d84b921994440bf627df29
2015-12-28 11:20:58 -08:00
Mark Salyzyn
94ab88228e resolve merge conflicts of f3cc23524f to mnc-dr2-dev-plus-aosp.
Change-Id: I8fe1e5b4797405b2f470fb3fa538bd3728048f00
2015-12-28 10:49:04 -08:00
Mark Salyzyn
f3cc23524f Merge "Settings: Add option to disable logging" 2015-12-28 17:35:26 +00:00
Xinghan Yue
b997bd989e Fix "division by zero" crash after USB mass storage disconnects
File.java will return the total size in bytes of the partition
containing the path, and if the path does not exist,
it will return 0.

Change-Id: I134d4ec787b475e38bb37b4386bafcc419971c1e
2015-12-28 18:01:51 +01: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
Eri Kasamatsu
70b1928a5a Change receiver name attribute for DISCOVERABLE_TIMEOUT
BluetoothDiscoverableTimeoutReceiver cannot receive
DISCOVERABLE_TIMEOUT intent because receiver name attribute
was incorrect.

BluetoothDiscoverableTimeoutReceiver has been moved to
frameworks/base/packages/SettingsLib/.../bluetooth
from packages/apps/Settings/.../bluetooth/.

Change-Id: I52bb32b2e206f5ed85207d6908e3ab39cbcd12cc
2015-12-24 00:34:23 +01: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
Maurice Lam
00d82f054c [WifiDialog] Suppress activity transition
Suppress the activity transition when finishing so that only the
dialog's animation will be played.

Bug: 25796672
Change-Id: I0c472313608aa46f780ce2fdb79224c0ad3a4dad
2015-12-22 15:26:12 -08:00
Mark Salyzyn
285afa8d15 Settings: Add option to disable logging
Bug: 26178938
Change-Id: I64263595705ceb1e6816e3cdfa982929877ff5b2
2015-12-22 15:14:56 -08: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
Maurice Lam
78ce0e4712 [RedactionInterstitial] Fix RTL text alignment
Bug: 26274783
Change-Id: I3847daa7f63f1caf93aa2ed119b8f176e79d250a
2015-12-21 10:42:11 -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
Anna Galusza
bf95133f75 Add A11y SUW hub page. Minor alterations of
Magnification screen to be consistent wtih most
recent desigs.

Change-Id: I191f6f66edb26597db6f4ed41311998b8ce26ca4
2015-12-18 12:58:31 -08: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