OSDN Git Service
Vinit Deshpande [Mon, 16 Mar 2015 07:55:25 +0000 (00:55 -0700)]
Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'
Change-Id: I6c9de433a224925961b484b400a89edf9059d2bd
Wale Ogunwale [Fri, 13 Mar 2015 15:52:35 +0000 (15:52 +0000)]
Merge "Remove multi-window developer setting from search index if disabled."
Zoltan Szatmary-Ban [Fri, 13 Mar 2015 09:28:45 +0000 (09:28 +0000)]
Merge "Make default user icons retrievable as cached bitmaps"
Jim Miller [Thu, 12 Mar 2015 21:21:03 +0000 (21:21 +0000)]
Merge "Add flag to hide disabled keyguard options."
Jim Miller [Thu, 12 Mar 2015 03:17:39 +0000 (20:17 -0700)]
Add flag to hide disabled keyguard options.
Normally keyguard options are disabled by things like credential
storage and device admins, so we show the reason in ChooseLockGeneric.
However, in the case of fingerprint we want to limit the scope
to just those options that have security (pin,password,pattern).
Bug
19592835
Change-Id: I6832ff692bad538adeec2f2575fca4f8f04f40cf
Wale Ogunwale [Thu, 12 Mar 2015 19:10:13 +0000 (12:10 -0700)]
Remove multi-window developer setting from search index if disabled.
Bug:
19494313
Change-Id: I6339d06a4b2ffe712ff8a2a3e72ddfdc63244d28
Jim Miller [Thu, 12 Mar 2015 17:57:50 +0000 (17:57 +0000)]
Merge "Don't reset fingerprint storage on devices without fingerprint hw."
Jim Miller [Thu, 12 Mar 2015 17:33:53 +0000 (10:33 -0700)]
Don't reset fingerprint storage on devices without fingerprint hw.
Fixes bug
19707354
Change-Id: I26144dc855bff83cdc9c9544c8ab7449274d7b5e
Geoff Mendal [Thu, 12 Mar 2015 17:25:27 +0000 (17:25 +0000)]
am
9f0b7264: (-s ours) am
feb731a2: (-s ours) am
dd07a862: (-s ours) Import translations. DO NOT MERGE
* commit '
9f0b7264e55ca2ba96cd09df0c307c169c58b56d':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 12 Mar 2015 17:25:26 +0000 (17:25 +0000)]
am
3335973a: (-s ours) am
f02db6b7: (-s ours) Import translations. DO NOT MERGE
* commit '
3335973a6710135a299a615c7a48555c51586e97':
Import translations. DO NOT MERGE
Jason Monk [Thu, 12 Mar 2015 14:32:00 +0000 (14:32 +0000)]
Merge "Follow-up on comments from splitting app info"
Jason Monk [Thu, 12 Mar 2015 14:23:51 +0000 (14:23 +0000)]
Merge "Support some changes to SettingsLib"
Jim Miller [Thu, 12 Mar 2015 01:20:17 +0000 (01:20 +0000)]
Merge "Implement additional fingerprint flows in Settings."
Jim Miller [Thu, 5 Mar 2015 02:07:32 +0000 (18:07 -0800)]
Implement additional fingerprint flows in Settings.
- new onboarding flow ("locate sensor")
- changed sensor location image
- changed in-app sensor icon
- remove fingerprint animation since it caused people to
want to tap on it.
- remove enrolled fingerprint templates when switching back to "none" or "slide"
- use real in-app icon for fingerprint
- much improved layout
- basic landscape layout working
- added 250ms delay to final enrollment step so it's not so jarring
- delete is now working
- rename wired, but not functional yet
Bug
19592835
Change-Id: Ie3e73a2fc8f834f1b90e2746c4cc841216aa6031
Maurice Lam [Wed, 11 Mar 2015 23:22:19 +0000 (23:22 +0000)]
Merge "[WifiSettings] Refactor Wi-Fi required info"
Maurice Lam [Thu, 5 Mar 2015 19:20:47 +0000 (11:20 -0800)]
[WifiSettings] Refactor Wi-Fi required info
Instead of using an invisible TextView in the layout itself, make the
required info a list header. This paves way for using the Setup
Wizard library by including all the required contents in the ListView
itself.
The required info is not shown since Lollipop, but can be tested with
adb shell am start -a "com.android.net.wifi.SETUP_WIFI_NETWORK" \
--es theme material_light \
--ez useImmersiveMode true \
--ez wifi_show_wifi_required_info true
Bug:
19698532
Change-Id: I5a7da726b2f49af7dd755b41c73e1a1b4349699c
Robin Lee [Wed, 11 Mar 2015 18:47:48 +0000 (18:47 +0000)]
Merge "Don't reset the keystore during password change"
Geoff Mendal [Wed, 11 Mar 2015 17:25:25 +0000 (17:25 +0000)]
am
feb731a2: (-s ours) am
dd07a862: (-s ours) Import translations. DO NOT MERGE
* commit '
feb731a2c94d2238587d1a84d0a2d09f99329612':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Mar 2015 17:25:11 +0000 (17:25 +0000)]
am
f02db6b7: (-s ours) Import translations. DO NOT MERGE
* commit '
f02db6b7e8fc774e64b812613cde7746d31aa10e':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Mar 2015 13:35:00 +0000 (06:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id8312d1b2f877c9236d1f517c5d92d5340f23d6e
Auto-generated-cl: translation import
Geoff Mendal [Wed, 11 Mar 2015 12:49:26 +0000 (12:49 +0000)]
am
dd07a862: (-s ours) Import translations. DO NOT MERGE
* commit '
dd07a86251dd79190bdc7bc811ae09c65eab89d2':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Mar 2015 12:40:13 +0000 (05:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia9a0856a78edd8afe8c540b8c68e88b063b34b1d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 11 Mar 2015 12:28:40 +0000 (05:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia835e0d6c351a29462c1d8adcd002f6f1bec598b
Auto-generated-cl: translation import
Pavel Zhamaitsiak [Tue, 10 Mar 2015 19:34:18 +0000 (19:34 +0000)]
Merge "Show alerts in case of some IMS registration errors." into lmp-mr1-wfc-dev
automerge:
4c7a410
* commit '
4c7a4101ca87668341a998d17e929f66973c53f5':
Show alerts in case of some IMS registration errors.
Pavel Zhamaitsiak [Tue, 10 Mar 2015 19:27:31 +0000 (19:27 +0000)]
Merge "Show alerts in case of some IMS registration errors." into lmp-mr1-wfc-dev
Pavel Zhamaitsiak [Tue, 10 Mar 2015 16:57:44 +0000 (16:57 +0000)]
Update Wi-Fi Calling mode when WFC is enabled/disabled
automerge:
248b8fd
* commit '
248b8fd7bf46c80d06e36aa9328c6fd0e0d326ce':
Update Wi-Fi Calling mode when WFC is enabled/disabled
Geoff Mendal [Tue, 10 Mar 2015 15:47:28 +0000 (15:47 +0000)]
am
a3d28d9c: (-s ours) am
fd8f5459: (-s ours) am
0d8c3df4: (-s ours) Import translations. DO NOT MERGE
* commit '
a3d28d9cccaa743eb050a4c427d11de204525c98':
Import translations. DO NOT MERGE
Pavel Zhamaitsiak [Sat, 7 Mar 2015 00:02:53 +0000 (16:02 -0800)]
Show alerts in case of some IMS registration errors.
Change-Id: I7019c6f0bae66190d190babd83ebcdd780e5b8a0
Pavel Zhamaitsiak [Mon, 9 Mar 2015 23:58:39 +0000 (16:58 -0700)]
Update Wi-Fi Calling mode when WFC is enabled/disabled
Bug:
19644042
Change-Id: Ie9cfe8c7f416985e4f78d48159d83191a19ac599
Geoff Mendal [Mon, 9 Mar 2015 17:01:45 +0000 (17:01 +0000)]
am
fd8f5459: (-s ours) am
0d8c3df4: (-s ours) Import translations. DO NOT MERGE
* commit '
fd8f545977ae4b5826632d8de293b3d322ae9960':
Import translations. DO NOT MERGE
Zoltan Szatmary-Ban [Fri, 19 Dec 2014 16:27:45 +0000 (16:27 +0000)]
Make default user icons retrievable as cached bitmaps
Also invoke that method where formerly we did a UserIcon.convertBitmap(
UserIcon.getDefaultUserIcon(...)) call.
Bug:
19620707
Change-Id: I2ae3bbcee7d1c6515f0f6253925ef9837d8e3548
Geoff Mendal [Mon, 9 Mar 2015 15:49:34 +0000 (15:49 +0000)]
am
782d81bc: (-s ours) am
f91c51b1: (-s ours) Import translations. DO NOT MERGE
* commit '
782d81bc70e4bc5b1adbd86119fd70a935e617f6':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Mar 2015 15:45:14 +0000 (15:45 +0000)]
am
0d8c3df4: (-s ours) Import translations. DO NOT MERGE
* commit '
0d8c3df4d95ec000889e3406ea50475e5d299874':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Mar 2015 15:35:57 +0000 (15:35 +0000)]
am
f91c51b1: (-s ours) Import translations. DO NOT MERGE
* commit '
f91c51b13b750f5ccc62ee1d760bd470b78837bb':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Mar 2015 13:35:26 +0000 (06:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3136e17493fb2f0d42e1518c5445b48aa203aa90
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Mar 2015 12:41:43 +0000 (05:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: If88c28e5bfe82169fa423ef04bc7cc4ee2aa9962
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Mar 2015 12:30:12 +0000 (05:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9e9281f6e2d2e50882fcec514ffc28993787a62a
Auto-generated-cl: translation import
Vinit Deshpande [Fri, 6 Mar 2015 21:56:02 +0000 (13:56 -0800)]
am "Do not provide 5GHz option for softap if there is no country code available"
merged from partner/m-wireless-wifi-dev
d51b952 Do not provide 5GHz option for softap if there is no country code available
Vinit Deshpande [Fri, 6 Mar 2015 21:56:02 +0000 (13:56 -0800)]
am "set softAP on a specified band, including both 2.4 and 5 GHz band"
merged from partner/m-wireless-wifi-dev
82ff3d5 set softAP on a specified band, including both 2.4 and 5 GHz band
Robin Lee [Fri, 6 Mar 2015 12:12:03 +0000 (12:12 +0000)]
Don't reset the keystore during password change
There is absolutely no advantage to doing this.
Bug:
18817878
Change-Id: Ibb386696e67c316e65f53c28f9249ef2a2a48db6
Adrian Roos [Thu, 5 Mar 2015 19:05:31 +0000 (20:05 +0100)]
Ensure redaction settings are visible on narrow screens
Bug:
18599040
Change-Id: I852f8fa317927f6f786b33f965e9d1feab562518
Geoff Mendal [Wed, 4 Mar 2015 14:46:45 +0000 (14:46 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 4 Mar 2015 14:41:39 +0000 (06:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2ea337dfa70639c56d7e9bce0513f7550cac54f4
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Mar 2015 14:00:38 +0000 (14:00 +0000)]
am
a6315bde: (-s ours) am
a07520f6: (-s ours) am
ba5c9ed1: (-s ours) Import translations. DO NOT MERGE
* commit '
a6315bde9d4d696a1b23aa1d5be1511ec9a21aed':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:54:47 +0000 (13:54 +0000)]
am
a07520f6: (-s ours) am
ba5c9ed1: (-s ours) Import translations. DO NOT MERGE
* commit '
a07520f6888981f4e310aa3c3c49ff6ea04b51d0':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:47:20 +0000 (13:47 +0000)]
am
ba5c9ed1: (-s ours) Import translations. DO NOT MERGE
* commit '
ba5c9ed1835cb3eef7dcf6e2968be1b0e5316dc5':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:44:17 +0000 (13:44 +0000)]
am
d1c5ae48: (-s ours) am
b4ee938f: (-s ours) Import translations. DO NOT MERGE
* commit '
d1c5ae486dc09d10dffaf138c98ad6daed182993':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:41:50 +0000 (05:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: I51a7c7c78b210268bc543e3ca81e123b02c0e525
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Mar 2015 13:37:29 +0000 (13:37 +0000)]
am
b4ee938f: (-s ours) Import translations. DO NOT MERGE
* commit '
b4ee938f74fdf6ffe3cad237342d7f5034a55053':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:30:02 +0000 (05:30 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1e33ed430ca8680d04f1bccd0253b8e7620c28e3
Auto-generated-cl: translation import
Pavel Zhamaitsiak [Tue, 3 Mar 2015 23:41:33 +0000 (23:41 +0000)]
Wi-Fi calling settings cleanup
automerge:
7109932
* commit '
71099329cc0443ce4517480c86f81ed6b4e33ff2':
Wi-Fi calling settings cleanup
Wale Ogunwale [Tue, 3 Mar 2015 21:28:46 +0000 (21:28 +0000)]
Merge "Added Developer Options settings for multi-window mode."
Wale Ogunwale [Fri, 27 Feb 2015 22:22:04 +0000 (14:22 -0800)]
Added Developer Options settings for multi-window mode.
Enables/disables the development multi-windows UI under Recents UI.
Setting is hidden on -user builds.
Bug:
19494313
Change-Id: Id1ccec5d9552dfdc74cc8d0af26ba7e6c4456166
Julia Reynolds [Tue, 3 Mar 2015 18:42:13 +0000 (18:42 +0000)]
Merge "Prompt for lock pin on VPN screen when credential restriction is enabled."
Julia Reynolds [Tue, 3 Mar 2015 17:32:30 +0000 (12:32 -0500)]
Prompt for lock pin on VPN screen when credential restriction is enabled.
If there is no lock pin set.
Bug:
19569109
Change-Id: I9ca17b61e72576f7b90b1598b2ace6e9d79b263a
Jason Monk [Tue, 3 Mar 2015 14:05:19 +0000 (09:05 -0500)]
Follow-up on comments from splitting app info
Bug:
19511439
Change-Id: Id1395597262f66514808f71d99978120dbba70e1
Jason Monk [Tue, 3 Mar 2015 13:35:51 +0000 (13:35 +0000)]
Merge "Split app info into several screens"
Pavel Zhamaitsiak [Mon, 2 Mar 2015 23:01:03 +0000 (15:01 -0800)]
Wi-Fi calling settings cleanup
Bug:
19573771
Change-Id: Idcbbdc962238f0a32fd7adf4d6b8409d6e6ffd37
Alan Viverette [Tue, 3 Mar 2015 00:49:02 +0000 (16:49 -0800)]
Add comment for night mode search keyword translations
Bug:
19562061
Change-Id: Ifb4100c721331379474d967d3f6ce7fd18a93ed4
Santos Cordon [Fri, 6 Feb 2015 13:38:06 +0000 (05:38 -0800)]
Update Multi-SIM setting to use getSubIdForPhoneAccount API.
Settings app should not be parsing the subId direction from the phone
account. Instead this CL updates the settings app to use a new API to
grab the sub ID.
Change-Id: Iefd1831b04c061168fa2b135a2d296a27e3d4e92
Fyodor Kupolov [Mon, 2 Mar 2015 19:13:57 +0000 (19:13 +0000)]
Merge "Settings app should be available to restricted user"
Fyodor Kupolov [Mon, 2 Mar 2015 18:59:23 +0000 (10:59 -0800)]
Settings app should be available to restricted user
Fixed a regression, caused by collapsing location and settings entries
into a single preference. Now settings package is explicitly enabled.
Bug:
19434520
Change-Id: I05440d04c100b6a5ee5573ac116bfb4d66782aa8
Geoff Mendal [Mon, 2 Mar 2015 15:34:31 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE"
Jason Monk [Tue, 24 Feb 2015 16:35:29 +0000 (11:35 -0500)]
Split app info into several screens
The root screen now only has the uninstall/force stop/disable buttons
and the rest has moved to sub screens listed in a preference list.
The root screen as UI approximate to the new mocks, but the separated
screens (storage, launch by default, etc.) have yet to receive their
visual overhaul.
Bug:
19511439
Change-Id: I4e01fbaefc69e0652edea2429d9e9b028c78e825
Geoff Mendal [Mon, 2 Mar 2015 14:53:43 +0000 (06:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3574bfb3765fa66d505905b0abd2344e832d2c78
Auto-generated-cl: translation import
Geoff Mendal [Mon, 2 Mar 2015 14:26:10 +0000 (14:26 +0000)]
am
bd74dff8: (-s ours) am
a377ea1c: (-s ours) am
130fc5ca: (-s ours) Import translations. DO NOT MERGE
* commit '
bd74dff8b451a7099beb6cacc54f1062d58b5054':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Mar 2015 14:20:44 +0000 (14:20 +0000)]
am
a377ea1c: (-s ours) am
130fc5ca: (-s ours) Import translations. DO NOT MERGE
* commit '
a377ea1cb1478503629a7b38c8b11687c7658599':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Mar 2015 14:13:01 +0000 (14:13 +0000)]
am
130fc5ca: (-s ours) Import translations. DO NOT MERGE
* commit '
130fc5caf8083581f7a3d66930b5ae39e2b4ccd1':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Mar 2015 14:02:20 +0000 (14:02 +0000)]
am
2e4703f4: (-s ours) am
5c66aacd: (-s ours) Import translations. DO NOT MERGE
* commit '
2e4703f42222483391fed23bb5e864b0165c7130':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Mar 2015 13:55:58 +0000 (13:55 +0000)]
am
5c66aacd: (-s ours) Import translations. DO NOT MERGE
* commit '
5c66aacd419460e79e84bc0a324cbb60152f32c1':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Mar 2015 13:55:15 +0000 (05:55 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iaf3498c2c21da6853e8f80ba582c2d4ac6309331
Auto-generated-cl: translation import
Geoff Mendal [Mon, 2 Mar 2015 13:43:21 +0000 (05:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: I81c7b09f5de8fffe27b732d45ff00d02ad5e26d1
Auto-generated-cl: translation import
Jim Miller [Fri, 20 Feb 2015 05:04:57 +0000 (21:04 -0800)]
Add fingerprint settings.
- Improved layout.
- Enrollment is now working.
- Added vibration and progress feedback.
- Better fingerprint animation logic.
- Poke userActivity() when sensor is touched.
- Added progress animation.
- Only show fingerprint menu item on devices that have fingerprint hw
- Set View state to GONE for views that aren't shown & fix resulting layout issue
- Fix bug where stage wasn't advancing when returning from ChooseLockGeneric.
- Renamed FingerprintSettings to FingerprintEnroll
- Fixed bug with storing fingerprint ids that prevented the last one from being removed.
- Added better progress indication. When remaining is at max, count that as the first step.
- Fix whitespace formatting in CL
Fixes bug
1953439
Change-Id: I721bf440c63640203af94ce21340d8281076c249
Fabrice Di Meglio [Fri, 27 Feb 2015 19:19:01 +0000 (19:19 +0000)]
Merge "Fix bug #
19313587 Settings unusable when userdata is full"
Alan Viverette [Fri, 27 Feb 2015 19:15:54 +0000 (19:15 +0000)]
Merge "Add support for user-selectable dark/light theme"
Fabrice Di Meglio [Fri, 27 Feb 2015 19:14:11 +0000 (11:14 -0800)]
Fix bug #
19313587 Settings unusable when userdata is full
- take care of low storage space use case: do not start
and Index update if we are is low storage space situation.
Change-Id: Ifa5bb618d087826c004b06aa7821b9634038734c
Alan Viverette [Thu, 26 Feb 2015 02:47:37 +0000 (18:47 -0800)]
Add support for user-selectable dark/light theme
Updates Settings to use the DayNight theme (real name TBD) and fixes
several colors that were pinned to non-theme values. Adds a setting for
switching theme between light/dark/auto.
Bug:
19368658
Bug:
19369392
Change-Id: I7cd23b7ad38bdb25a01b92e67ff1ee1cdd8a3958
Robin Lee [Fri, 27 Feb 2015 16:13:55 +0000 (16:13 +0000)]
Merge "Badge Wi-Fi installer apps"
Robin Lee [Thu, 26 Feb 2015 12:30:09 +0000 (12:30 +0000)]
Badge Wi-Fi installer apps
Consistent, and more importantly useful to know which version of an app
was responsible for installing a network.
Change-Id: I37e326f419e03b020e17daa7d65c713d1ea6ddc8
Sanket Padawe [Thu, 26 Feb 2015 23:43:07 +0000 (23:43 +0000)]
am
85b04c19: am
130a76c8: am
49d660ac: am
4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev
* commit '
85b04c19ed81e74709d74d2acffd4bd42a3b07de':
Use TelephonyManager api to get SPN of sim to display in UI.
Sanket Padawe [Thu, 26 Feb 2015 23:31:28 +0000 (23:31 +0000)]
am
130a76c8: am
49d660ac: am
4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev
* commit '
130a76c806469b5b814b1d647713dd0cdec1fe9f':
Use TelephonyManager api to get SPN of sim to display in UI.
Geoff Mendal [Thu, 26 Feb 2015 23:25:47 +0000 (23:25 +0000)]
am
2061f4e2: (-s ours) am
cfad6fc1: (-s ours) Import translations. DO NOT MERGE
* commit '
2061f4e296a94093920c772cfeb12c03eac98ac6':
Import translations. DO NOT MERGE
Sanket Padawe [Thu, 26 Feb 2015 23:18:55 +0000 (23:18 +0000)]
am
49d660ac: am
4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev
* commit '
49d660ac014c3802aa5e694d745b284fc2b601ae':
Use TelephonyManager api to get SPN of sim to display in UI.
Geoff Mendal [Thu, 26 Feb 2015 23:14:45 +0000 (23:14 +0000)]
am
cfad6fc1: (-s ours) Import translations. DO NOT MERGE
* commit '
cfad6fc1ff4cc23582d8d1a6cb8371ea32c82544':
Import translations. DO NOT MERGE
Sanket Padawe [Thu, 26 Feb 2015 22:04:34 +0000 (22:04 +0000)]
am
4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev
* commit '
4e838ca96ec1ebf1df3d75e729facf1fc012b431':
Use TelephonyManager api to get SPN of sim to display in UI.
Sanket Padawe [Thu, 26 Feb 2015 22:04:10 +0000 (22:04 +0000)]
am
4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev
* commit '
4e838ca96ec1ebf1df3d75e729facf1fc012b431':
Use TelephonyManager api to get SPN of sim to display in UI.
Sanket Padawe [Thu, 26 Feb 2015 21:57:50 +0000 (21:57 +0000)]
Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev
Geoff Mendal [Thu, 26 Feb 2015 21:08:22 +0000 (13:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6e606f63db232302aa02be469a2560a5455eb11e
Auto-generated-cl: translation import
Pavel Zhamaitsiak [Mon, 23 Feb 2015 23:34:07 +0000 (15:34 -0800)]
Add Wi-Fi Calling preference screen
Change-Id: Ie89902b55c5c4184236636f5039b3246a9c0bda5
Dianne Hackborn [Fri, 20 Feb 2015 20:48:32 +0000 (12:48 -0800)]
Raise priority of key settings actions.
There are a bunch of actions settings handles that are really
part of the platform API, allowing apps to launch various parts
of system UI to have the user do things. Currently these can
be intercepted by app developers by implementing the same
intent actions -- which will still have the user end up in
the activity picker to select which of the options to use, but
we really shouldn't be allowing them to get in the middle of
this at all.
To fix this, all of the specific actions that are handled by
settings and shouldn't be intercepted now have their priority
raised to 1, so they always override any filters from third
party applications.
Change-Id: I0f7050212beaec013e5ec08899d49f120ce5c249
Fyodor Kupolov [Wed, 25 Feb 2015 20:21:25 +0000 (20:21 +0000)]
Merge "Allow alternative policy description for secondary users"
Lifu Tang [Wed, 25 Feb 2015 20:05:59 +0000 (20:05 +0000)]
am
a28ffcb5: am
0209af6b: am
6ff1a66c: am
1bbd8814: Removed extra "your" from device only subtext
* commit '
a28ffcb56e225e0b10ca3803ef00ae583fafb307':
Removed extra "your" from device only subtext
Fyodor Kupolov [Tue, 24 Feb 2015 17:26:53 +0000 (09:26 -0800)]
Allow alternative policy description for secondary users
For policies like wipe-data, device admin policy description should be
customizable for secondary users.
Bug:
19194766
Change-Id: I0907ffb973eae247707380af1be9894ca403010f
Lifu Tang [Wed, 25 Feb 2015 19:56:37 +0000 (19:56 +0000)]
am
0209af6b: am
6ff1a66c: am
1bbd8814: Removed extra "your" from device only subtext
* commit '
0209af6bc7979ef11011d8cce162c437ca472126':
Removed extra "your" from device only subtext
Lifu Tang [Wed, 25 Feb 2015 19:50:56 +0000 (19:50 +0000)]
am
6ff1a66c: am
1bbd8814: Removed extra "your" from device only subtext
* commit '
6ff1a66c3ce39396ec1cb70c45682407faa31376':
Removed extra "your" from device only subtext
Lifu Tang [Wed, 25 Feb 2015 19:43:39 +0000 (19:43 +0000)]
am
1bbd8814: Removed extra "your" from device only subtext
* commit '
1bbd8814c66f8e67cfb7e86e880c85727ed1743e':
Removed extra "your" from device only subtext
Lifu Tang [Wed, 25 Feb 2015 19:43:20 +0000 (19:43 +0000)]
am
1bbd8814: Removed extra "your" from device only subtext
* commit '
1bbd8814c66f8e67cfb7e86e880c85727ed1743e':
Removed extra "your" from device only subtext
Geoff Mendal [Wed, 25 Feb 2015 14:28:40 +0000 (06:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iefd9997748c2bcfa757e4c138a764640ed6a29af
Auto-generated-cl: translation import
Lifu Tang [Tue, 24 Feb 2015 23:25:27 +0000 (15:25 -0800)]
Removed extra "your" from device only subtext
Bug:
19463511
Change-Id: Ic9449561ee974b6566bf76ea3ca2e774f5be03d2
Sanket Padawe [Tue, 24 Feb 2015 21:30:33 +0000 (13:30 -0800)]
Use TelephonyManager api to get SPN of sim to display in UI.
Bug:
19476304
Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7