OSDN Git Service
Jeff Sharkey [Wed, 6 Jan 2016 21:51:30 +0000 (14:51 -0700)]
Follow PackageManager refactoring.
Change-Id: Iae8b40acf6317366f0de780e367e0c21a9966477
Geoff Mendal [Wed, 6 Jan 2016 14:26:38 +0000 (06:26 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4903c2ca744d9ff3a955471ca92ff3b8eaa9f732
Auto-generated-cl: translation import
Robin Lee [Wed, 6 Jan 2016 12:16:56 +0000 (12:16 +0000)]
Merge "[VPN] save public legacy VPN details publicly"
Filip Gruszczynski [Tue, 5 Jan 2016 21:29:08 +0000 (13:29 -0800)]
Always show true value for forcing resizeable.
Change-Id: I557ad5ddd29ac20119b926e58e33c6f58145d78e
Julia Reynolds [Tue, 5 Jan 2016 20:58:23 +0000 (20:58 +0000)]
Merge "DND Visual interruptions: don't turn screen on."
Filip Gruszczynski [Tue, 5 Jan 2016 20:18:16 +0000 (12:18 -0800)]
Add missing development preference for enabling freeform.
Change-Id: I77d9621f76f96ba547370e5fedfed250f9dcf3d1
Robin Lee [Thu, 17 Dec 2015 11:58:24 +0000 (11:58 +0000)]
[VPN] save public legacy VPN details publicly
This does not include certificates, private keys etc. which are still
saved in the KeyStore with the encryption the user requested for them.
Makes connecting to lockdown vpn before user unlock possible.
Bug:
26108660
Change-Id: I56c1672c7a41e761c2791584b99900aff51b59e4
Geoff Mendal [Tue, 5 Jan 2016 16:17:50 +0000 (16:17 +0000)]
Merge "Import translations. DO NOT MERGE"
Jeff Sharkey [Tue, 5 Jan 2016 16:16:59 +0000 (16:16 +0000)]
Merge "Some text are missing in eject sdcard warning" am:
24eaa7ed2b
am:
c088ea23eb
* commit '
c088ea23eb0231d49c151e71807fccc5099501c8':
Some text are missing in eject sdcard warning
Jeff Sharkey [Tue, 5 Jan 2016 16:15:13 +0000 (16:15 +0000)]
Merge "Some text are missing in eject sdcard warning"
am:
24eaa7ed2b
* commit '
24eaa7ed2b2a709fd5ad2b45ad92de6e617e126a':
Some text are missing in eject sdcard warning
Jeff Sharkey [Tue, 5 Jan 2016 16:11:14 +0000 (16:11 +0000)]
Merge "Some text are missing in eject sdcard warning"
Geoff Mendal [Tue, 5 Jan 2016 15:56:37 +0000 (07:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9ed660e4a0cb209ff3a19943b4f294fcfde307b1
Auto-generated-cl: translation import
Julia Reynolds [Tue, 5 Jan 2016 15:31:13 +0000 (10:31 -0500)]
DND Visual interruptions: don't turn screen on.
Change-Id: I15b66918e53e733c779cf8f79d12e03a213fb26d
Jorim Jaggi [Tue, 5 Jan 2016 13:30:32 +0000 (13:30 +0000)]
Merge "Add developer option for freeform window support (2/2)"
Amith Yamasani [Tue, 5 Jan 2016 00:33:03 +0000 (00:33 +0000)]
Merge "Fix "division by zero" crash after USB mass storage disconnects" am:
a44b4feed4
am:
4ed2bb1ba9
* commit '
4ed2bb1ba93d8b5fe101c660d24898bf3ed44592':
Fix "division by zero" crash after USB mass storage disconnects
Amith Yamasani [Tue, 5 Jan 2016 00:31:12 +0000 (00:31 +0000)]
Merge "Fix "division by zero" crash after USB mass storage disconnects"
am:
a44b4feed4
* commit '
a44b4feed42d597224f9221396ef3ca1964ecc4b':
Fix "division by zero" crash after USB mass storage disconnects
Amith Yamasani [Tue, 5 Jan 2016 00:26:43 +0000 (00:26 +0000)]
Merge "Fix "division by zero" crash after USB mass storage disconnects"
Nathan Harold [Mon, 4 Jan 2016 23:55:59 +0000 (23:55 +0000)]
Merge "Fix Resource Reference to radio_info_ping_hostname"
Nathan Harold [Mon, 4 Jan 2016 23:27:32 +0000 (15:27 -0800)]
Fix Resource Reference to radio_info_ping_hostname
Bug:
26386182
Change-Id: If1204ab9e2c255995c418babed2096dc9c815345
Julia Reynolds [Mon, 4 Jan 2016 22:07:28 +0000 (22:07 +0000)]
Merge "Allow users to choose a notification assistant."
Julia Reynolds [Mon, 14 Dec 2015 13:32:46 +0000 (08:32 -0500)]
Allow users to choose a notification assistant.
Change-Id: Iddfbfedbb6a3aae246058ff41324dc06852484cb
Xiaohui Chen [Mon, 4 Jan 2016 17:21:16 +0000 (17:21 +0000)]
Merge "Make FallbackHome lower priority."
Sudheer Shanka [Mon, 4 Jan 2016 15:49:20 +0000 (15:49 +0000)]
Merge "Rename the intent for ShowAdminSupportDetailsDialog again."
Jorim Jaggi [Mon, 28 Dec 2015 10:15:28 +0000 (11:15 +0100)]
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
Jason Monk [Mon, 4 Jan 2016 14:44:25 +0000 (14:44 +0000)]
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.
Jason Monk [Mon, 4 Jan 2016 14:42:31 +0000 (14:42 +0000)]
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.
Jason Monk [Mon, 4 Jan 2016 14:39:38 +0000 (14:39 +0000)]
Merge "fix out of memory with continuous entry and exit InstalledAppDetail."
daqiangx [Mon, 21 Dec 2015 08:02:25 +0000 (16:02 +0800)]
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>
Sudheer Shanka [Thu, 31 Dec 2015 17:46:29 +0000 (17:46 +0000)]
Rename the intent for ShowAdminSupportDetailsDialog again.
Change-Id: I0ffb353e8b131a5bc8a570f271118e19348a4b3a
Sudheer Shanka [Thu, 31 Dec 2015 14:58:02 +0000 (14:58 +0000)]
Rename the intent for ShowAdminSupportDetailsDialog.
Change-Id: Ie3aecedaedfb3feecb384bf1b9f73aa54077b071
Xiaohui Chen [Wed, 30 Dec 2015 23:51:56 +0000 (15:51 -0800)]
Make FallbackHome lower priority.
This makes SystemUserHomeActivity, which also has a low priority,
works properly for system user.
Bug:
26358655
Change-Id: If07b39ac5a7015805ac22a968b3d704aaad80012
Mark Salyzyn [Mon, 28 Dec 2015 19:08:01 +0000 (11:08 -0800)]
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
Mark Salyzyn [Mon, 28 Dec 2015 18:49:04 +0000 (10:49 -0800)]
resolve merge conflicts of
f3cc23524f to mnc-dr2-dev-plus-aosp.
Change-Id: I8fe1e5b4797405b2f470fb3fa538bd3728048f00
Mark Salyzyn [Mon, 28 Dec 2015 17:35:26 +0000 (17:35 +0000)]
Merge "Settings: Add option to disable logging"
Xinghan Yue [Mon, 28 Dec 2015 16:59:44 +0000 (17:59 +0100)]
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
Alex Cheung [Thu, 24 Dec 2015 01:06:20 +0000 (17:06 -0800)]
Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/
26154276
Nick Kralevich [Wed, 23 Dec 2015 19:01:05 +0000 (11:01 -0800)]
Merge "Hide usb mode chooser dialog after disconnected" am:
b913bf926e
am:
6556921a1e
* commit '
6556921a1edbddea64b54415967b2bacbb7bf456':
Hide usb mode chooser dialog after disconnected
Nick Kralevich [Wed, 23 Dec 2015 18:58:56 +0000 (10:58 -0800)]
Merge "Hide usb mode chooser dialog after disconnected"
am:
b913bf926e
* commit '
b913bf926e04280d0864cc36c759eddf88cf8b21':
Hide usb mode chooser dialog after disconnected
Nick Kralevich [Wed, 23 Dec 2015 18:55:09 +0000 (18:55 +0000)]
Merge "Hide usb mode chooser dialog after disconnected"
Mark Salyzyn [Tue, 22 Dec 2015 22:09:48 +0000 (14:09 -0800)]
Settings: Add option to disable logging
Bug:
26178938
Change-Id: I64263595705ceb1e6816e3cdfa982929877ff5b2
Philip P. Moltmann [Tue, 22 Dec 2015 21:49:29 +0000 (21:49 +0000)]
Merge "Use new getIcon and getMoreInfo api to show more information in Print Settings"
Svetoslav [Tue, 22 Dec 2015 19:46:06 +0000 (19:46 +0000)]
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
Svetoslav [Tue, 22 Dec 2015 19:44:00 +0000 (11:44 -0800)]
DO NOT MERGE Modify system settings: incorrect UI state am:
119d589ea5
am:
6e88d0b02f
* commit '
6e88d0b02f48d8b4c87f197ccca927373df99758':
DO NOT MERGE Modify system settings: incorrect UI state
Svetoslav [Tue, 22 Dec 2015 19:42:06 +0000 (19:42 +0000)]
DO NOT MERGE Modify system settings: incorrect UI state
am:
119d589ea5
* commit '
119d589ea5aa9c2ccc5164279d718a20d0865f20':
DO NOT MERGE Modify system settings: incorrect UI state
Svetoslav [Tue, 24 Nov 2015 19:31:13 +0000 (11:31 -0800)]
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
356fb2d10d9f4c236b0f10d0e2facb93028b9f3c)
Du, Changbin [Thu, 17 Dec 2015 02:26:26 +0000 (10:26 +0800)]
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>
Jack Yu [Thu, 3 Dec 2015 19:53:26 +0000 (11:53 -0800)]
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
Udam Saini [Mon, 21 Dec 2015 21:19:03 +0000 (21:19 +0000)]
Merge "Fixes password not being saved on orientation changed."
Jack Yu [Mon, 21 Dec 2015 19:47:42 +0000 (19:47 +0000)]
Merge "Added a new broadcast receiver to handle Brzail channel 50 area info"
Udam Saini [Mon, 21 Dec 2015 18:52:34 +0000 (10:52 -0800)]
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
Felipe Leme [Mon, 21 Dec 2015 17:58:09 +0000 (17:58 +0000)]
Merge "Changed dialog shown from "Take Bug Report" to display 2 options:"
Philip P. Moltmann [Tue, 1 Dec 2015 22:45:22 +0000 (14:45 -0800)]
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
Philip P. Moltmann [Mon, 21 Dec 2015 17:27:43 +0000 (17:27 +0000)]
Merge "Print-Settings Remove unused fields."
Felipe Leme [Wed, 16 Dec 2015 18:05:44 +0000 (10:05 -0800)]
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
Jeff Sharkey [Sat, 19 Dec 2015 00:19:27 +0000 (17:19 -0700)]
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
Philip P. Moltmann [Fri, 18 Dec 2015 22:02:52 +0000 (14:02 -0800)]
Print-Settings Remove unused fields.
Change-Id: I2f48c7bb54ab960178a8b7858f8accfe34107d7d
Mihai Nita [Wed, 16 Dec 2015 00:12:18 +0000 (16:12 -0800)]
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
Julia Reynolds [Fri, 18 Dec 2015 16:44:43 +0000 (11:44 -0500)]
Conditionally show settings.
Change-Id: I8e62ed6e2515b76de73d3d25adcfb121f809c646
Gustav Sennton [Thu, 17 Dec 2015 18:04:37 +0000 (18:04 +0000)]
Merge "Add null-pointer check for the case where we have no WebView provider."
Alan Viverette [Thu, 17 Dec 2015 17:45:36 +0000 (17:45 +0000)]
Merge "Localization clarifications"
Jason Monk [Thu, 17 Dec 2015 16:38:36 +0000 (16:38 +0000)]
Merge "Fix the build"
Jason Monk [Thu, 17 Dec 2015 16:37:26 +0000 (11:37 -0500)]
Fix the build
Change-Id: I4d8b039a68042d022db82668a8c6a78967e351e5
Alan Viverette [Thu, 17 Dec 2015 15:52:13 +0000 (10:52 -0500)]
Localization clarifications
Bug:
26223525
Bug:
26222163
Change-Id: I273d0452d26cfe4ec0e23a8455cda958dfcf26bb
Jason Monk [Thu, 17 Dec 2015 15:47:01 +0000 (15:47 +0000)]
Merge "Fix search highlighting items"
Gustav Sennton [Thu, 17 Dec 2015 15:44:16 +0000 (15:44 +0000)]
Add null-pointer check for the case where we have no WebView provider.
Change-Id: I33a142bd3af694dfe9c63e6852a6b5cd701de467
Jason Monk [Thu, 17 Dec 2015 15:39:44 +0000 (10:39 -0500)]
Fix search highlighting items
Bug:
24576551
Change-Id: I0a6c251cc93eef9f49070f2b7e57780d4542dd03
Julia Reynolds [Thu, 17 Dec 2015 13:46:09 +0000 (08:46 -0500)]
Don't show orphaned rule instances in Settings.
Bug:
25472361
Change-Id: Ic9bec4872777b720aa786679cbc960a9ee51dbe1
Jason Monk [Wed, 16 Dec 2015 21:43:02 +0000 (16:43 -0500)]
Avoid RecyclerView causing items to blink on update
Change-Id: Ic0bd70ec3f2a5e195cc0924c98c589f90e27afe9
Jason Monk [Wed, 16 Dec 2015 21:13:54 +0000 (16:13 -0500)]
Fix Settings Titles not being set correctly
Bug:
25585359
Change-Id: I523a00115295adb9f43de768bb40c02099ffb1af
Jason Monk [Wed, 16 Dec 2015 20:58:59 +0000 (15:58 -0500)]
Fix airplane mode conditional primary click
Change-Id: Iacd83b53be224ad8fd55fe176f66a0d724576247
Jason Monk [Wed, 16 Dec 2015 19:26:18 +0000 (14:26 -0500)]
Protect against crash when no NfcAdapter is around
Bug:
26155716
Change-Id: I9e10831ca068263b40fcf06bf83ce341d73e96d2
Jason Monk [Wed, 16 Dec 2015 17:58:39 +0000 (12:58 -0500)]
Add background data off conditional
Change-Id: If51fdaecc880560c4a0cd8d320b06804cfe98388
Jason Monk [Tue, 15 Dec 2015 20:54:26 +0000 (15:54 -0500)]
Add cellular data off conditional
Change-Id: I34980f3fc09bf5dd47eb296c5b1c5fccc87b5c90
Jason Monk [Tue, 15 Dec 2015 19:38:04 +0000 (14:38 -0500)]
Add battery saver conditional
Change-Id: If80b749185537f252dae88230f80b29bcf321fdf
Amit Mahajan [Mon, 14 Dec 2015 21:23:29 +0000 (13:23 -0800)]
Code cleanup including removing direct references to IMS classes.
Bug:
25793157
Change-Id: I15f285a03ce65695ac260945993fbd189ba3b5d0
Amit Mahajan [Tue, 15 Dec 2015 23:50:22 +0000 (23:50 +0000)]
Merge "Code cleanup including removing direct references to IMS classes."
Maurice Lam [Tue, 15 Dec 2015 22:20:47 +0000 (22:20 +0000)]
Merge "[ScreenLock] Fix result code handling"
Maurice Lam [Tue, 15 Dec 2015 02:03:54 +0000 (18:03 -0800)]
[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
Jason Monk [Tue, 15 Dec 2015 18:02:53 +0000 (18:02 +0000)]
Merge "Move DropDownPreference to supportlib"
Jason Monk [Sat, 12 Dec 2015 01:14:43 +0000 (20:14 -0500)]
Move DropDownPreference to supportlib
Change-Id: Ife6799d1136302b805b5191f1a86276c538ca4bf
Alan Viverette [Tue, 15 Dec 2015 15:24:53 +0000 (15:24 +0000)]
Merge "Allow use of comma to separate search keywords, update keywords"
Alan Viverette [Tue, 15 Dec 2015 14:50:44 +0000 (09:50 -0500)]
Allow use of comma to separate search keywords, update keywords
Bug:
26149710
Change-Id: I2d8095bbb007c011d7b3e2fe077115c696f9e39c
Clara Bayarri [Thu, 22 Oct 2015 16:24:43 +0000 (17:24 +0100)]
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
Jim Miller [Tue, 15 Dec 2015 04:08:30 +0000 (04:08 +0000)]
Merge "Fix blank animation in "find the sensor" flow for fingerprint."
Jim Miller [Tue, 15 Dec 2015 04:01:42 +0000 (20:01 -0800)]
Fix blank animation in "find the sensor" flow for fingerprint.
Fixes bug
26194530
Change-Id: I855b6f12a72c7489fae8fba249c55d4626b4a202
Paul Lawrence [Tue, 15 Dec 2015 02:46:39 +0000 (02:46 +0000)]
Merge "Fix no keyboard on N builds"
Paul Lawrence [Mon, 14 Dec 2015 22:42:48 +0000 (14:42 -0800)]
Fix no keyboard on N builds
Bug:
25942488
Bug:
26190615
Change-Id: Ifd588bf7db76f9ea5d6a90854f8e92f86f4c2910
Jim Miller [Fri, 20 Nov 2015 04:37:31 +0000 (20:37 -0800)]
Allow animation movie for "find the sensor" flow
This adds an optional overlay to specify a per-device
movie to illustrate enrolling a fingerprint. To enable,
create a new layout overlay for
fingerprint_enroll_find_sensor_graphic.xml using
FingerprintLocationAnimationVideoView
Fixes bug
22954305
Change-Id: I59294f71617ecf7a9bf09603fc0b068cc5aa8ff9
Jason Monk [Mon, 14 Dec 2015 21:39:45 +0000 (16:39 -0500)]
Fix CustomListPreference click handling
Bug:
26187611
Change-Id: I6293d5577b4f770e2dfe94bae53fa9da0822cefc
Amit Mahajan [Mon, 14 Dec 2015 21:23:29 +0000 (13:23 -0800)]
Code cleanup including removing direct references to IMS classes.
Bug:
25793157
Change-Id: I15f285a03ce65695ac260945993fbd189ba3b5d0
Jason Monk [Sun, 13 Dec 2015 21:19:05 +0000 (16:19 -0500)]
Add dnd conditional
Change-Id: I81eabf274bde05358c60bb63e1ed6d1bd447ce55
Jason Monk [Fri, 11 Dec 2015 21:48:31 +0000 (16:48 -0500)]
Add conditionals to Settings
Also add Airplane Mode and Hotspot conditionals (more to come soon)
Change-Id: I11f206db59f7c715f416fb5852b8f0fcb857a247
Gustav Sennton [Mon, 14 Dec 2015 14:33:55 +0000 (14:33 +0000)]
Merge "Add WebView provider setting to developer settings."
Kenny Guy [Mon, 14 Dec 2015 14:31:37 +0000 (14:31 +0000)]
Merge "Add support for showing the admin disabling settings."
Henrik Baard [Mon, 14 Dec 2015 09:16:28 +0000 (10:16 +0100)]
Some text are missing in eject sdcard warning
The eject sdcard warning page shows incomplete texts
in some languages (german) and it is not apparant that
that you can scroll to see the text.
The layout is divided into three parts, the button
and one blank line, and the text. The text and the
blanke space will have equal parts of the screen
since they have the same weight. Because of this the
(complete) text is not shown in som languages.
Remove the blank part and let the text use the whole
screen.
Change-Id: Id8fd88fc6c0aa6105d64c100e3365cd9b00bf851
Geoff Mendal [Sun, 13 Dec 2015 21:18:46 +0000 (13:18 -0800)]
Import translations. DO NOT MERGE am:
1cb1ad2c55 -s ours am:
ab3b13d0ed -s ours
am:
6419a4a6e2 -s ours
* commit '
6419a4a6e25dadb3cac04b041dd325510bd0a6d4':
Import translations. DO NOT MERGE
Geoff Mendal [Sun, 13 Dec 2015 21:18:13 +0000 (13:18 -0800)]
Revert "Import translations. DO NOT MERGE" am:
7bafd5ee2f -s ours am:
d2981b099e -s ours
am:
4f86f6274a -s ours
* commit '
4f86f6274aaa8966247000b6c5bf1fb01b6de4d9':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Sun, 13 Dec 2015 21:15:16 +0000 (13:15 -0800)]
Import translations. DO NOT MERGE am:
df57be8aef -s ours am:
bc84451452 -s ours
am:
819e07fbbe -s ours
* commit '
819e07fbbe3c1722d6e612d5c8c03e8ca7afbb33':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 12 Dec 2015 02:07:11 +0000 (18:07 -0800)]
Import translations. DO NOT MERGE am:
1cb1ad2c55 -s ours
am:
ab3b13d0ed -s ours
* commit '
ab3b13d0edce3b89bd5836f8a9446a427b6c6acc':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 12 Dec 2015 02:04:00 +0000 (18:04 -0800)]
Import translations. DO NOT MERGE
am:
1cb1ad2c55 -s ours
* commit '
1cb1ad2c55d1997dd5c31e5aed5062a4d395238f':
Import translations. DO NOT MERGE