OSDN Git Service
Jason Monk [Tue, 10 Nov 2015 20:22:57 +0000 (15:22 -0500)]
Various small crash fixes and guards
Bug:
25501551
Bug:
25583654
Bug:
25510495
Bug:
23575961
Change-Id: Id0e7f6aacdf763bf95b49d281aa8755afcd2e5ef
Jason Monk [Tue, 10 Nov 2015 20:09:34 +0000 (15:09 -0500)]
Context isn't good enough, actually check for null
Bug:
25606212
Change-Id: Ic765d5a37fa19ecd22bb47694514e6ee0bdb84a5
Jason Monk [Tue, 10 Nov 2015 19:54:18 +0000 (14:54 -0500)]
Use context instead of activity
Bug:
25606212
Change-Id: I5d7eca547562ab968c5f7a4b91119ee7b1c3bce5
Felipe Leme [Tue, 10 Nov 2015 00:28:40 +0000 (00:28 +0000)]
Merge "Set key when Explore preference is created, otherwise tapping it will cause a NPE. BUG:
25597961"
Felipe Leme [Mon, 9 Nov 2015 23:52:32 +0000 (15:52 -0800)]
Set key when Explore preference is created, otherwise tapping it will cause a NPE.
BUG:
25597961
Change-Id: I1e2fc8caa961e1054472b46cbeb6aad407a1f91a
Jason Monk [Mon, 9 Nov 2015 22:45:02 +0000 (22:45 +0000)]
Null check queryIntentServices am:
a4c9492b50 am:
e27cada8c4 am:
e198f7b84f
am:
7ee05202ab
* commit '
7ee05202abcf7be3b3ee9cf1bf894047b407ce2d':
Null check queryIntentServices
Jason Monk [Mon, 9 Nov 2015 22:40:33 +0000 (22:40 +0000)]
Null check queryIntentServices am:
a4c9492b50 am:
e27cada8c4
am:
e198f7b84f
* commit '
e198f7b84fde2b3ca3f0e0c9195166b06363850e':
Null check queryIntentServices
Jason Monk [Mon, 9 Nov 2015 22:36:21 +0000 (22:36 +0000)]
Null check queryIntentServices am:
a4c9492b50
am:
e27cada8c4
* commit '
e27cada8c49c8aec2463c352faf5211502b1b372':
Null check queryIntentServices
Jason Monk [Mon, 9 Nov 2015 22:31:51 +0000 (22:31 +0000)]
Null check queryIntentServices
am:
a4c9492b50
* commit '
a4c9492b50b742488a6a92abdc290b5ada3c004b':
Null check queryIntentServices
Jason Monk [Mon, 9 Nov 2015 21:56:46 +0000 (16:56 -0500)]
Null check queryIntentServices
Bug:
25575738
Change-Id: I006a0e2f47863ac0f5d8ae28c88614481d13e8d3
Philip P. Moltmann [Mon, 9 Nov 2015 18:38:22 +0000 (18:38 +0000)]
Merge "Remove warning message when enabling a serive and enable new services"
Geoff Mendal [Mon, 9 Nov 2015 14:18:36 +0000 (06:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: I89f6f6211dcd181e801cd15d58cc4017f2d2a898
Auto-generated-cl: translation import
Philip P. Moltmann [Tue, 3 Nov 2015 17:01:51 +0000 (09:01 -0800)]
Remove warning message when enabling a serive and enable new services
The warning message will be moved to the print spooler and displayed
when the user issues the first print job to the service.
Change-Id: I121ad0b46e5b3e25e68db4cc67a59fbaf15c70c3
Bug:
24135353
Jim Miller [Fri, 6 Nov 2015 23:22:25 +0000 (23:22 +0000)]
Merge "Auto advance fingerprint enrollment when user taps on the sensor"
Maurice Lam [Fri, 6 Nov 2015 20:52:33 +0000 (20:52 +0000)]
Merge "[WifiDialog] Theme for setup wizard"
Maurice Lam [Fri, 6 Nov 2015 02:51:05 +0000 (18:51 -0800)]
[WifiDialog] Theme for setup wizard
Use setup wizard themes so that dialogs are shown in the correct
accent colors and dark/light themes.
Bug:
25515641
Change-Id: I87a0a01001944b50e48ec812f071a988f37ed8db
Paul Lawrence [Thu, 5 Nov 2015 21:41:02 +0000 (21:41 +0000)]
Merge "Add developer option to convert from FDE to FBE"
Baligh Uddin [Thu, 5 Nov 2015 19:45:50 +0000 (19:45 +0000)]
Import translations. DO NOT MERGE am:
7b9f79bb6e -s ours
am:
4b87b724eb -s ours
* commit '
4b87b724eba9c368e9b9fc9fa5262b40bb5a2ae4':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:40:21 +0000 (19:40 +0000)]
Import translations. DO NOT MERGE
am:
7b9f79bb6e -s ours
* commit '
7b9f79bb6e6c72adae3e9674617b5b9c45c769bd':
Import translations. DO NOT MERGE
Felipe Leme [Tue, 3 Nov 2015 23:58:46 +0000 (15:58 -0800)]
Change workflow so update() is not called when the device changes orientation.
BUG:
24508289
Change-Id: I7929aac953741a19f5bc4ffbbb9929a9a2f6104e
Jason Monk [Wed, 4 Nov 2015 21:10:20 +0000 (21:10 +0000)]
Merge "Settings Drawer: Support multi-user changes"
Jason Monk [Wed, 4 Nov 2015 20:19:18 +0000 (20:19 +0000)]
Merge "First pass at drawer to Settings"
Baligh Uddin [Wed, 4 Nov 2015 20:11:39 +0000 (12:11 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I38ff46207ad622dc25f4cbbf6445ceac1dcfedb7
Jason Monk [Wed, 4 Nov 2015 18:16:18 +0000 (13:16 -0500)]
Settings Drawer: Support multi-user changes
Change-Id: I3a6e481ca18794bf1ed3bc9dc0382deacfcf81f4
Paul Lawrence [Mon, 2 Nov 2015 20:42:42 +0000 (12:42 -0800)]
Add developer option to convert from FDE to FBE
This set of changes adds the screen that offers this conversion,
and the plumbing so the option is only available on suitable
devices.
It does not implement the conversion mechanism.
Change-Id: I3c84dd40dfcb0e00dadbab54ba0e56e1ccb11ed8
Julia Reynolds [Wed, 4 Nov 2015 17:06:16 +0000 (17:06 +0000)]
Merge "Null check in onPostExecute."
Jason Monk [Thu, 10 Sep 2015 14:54:36 +0000 (10:54 -0400)]
First pass at drawer to Settings
Change-Id: I94c3bc69ff773e48c33f59f37bfc0d91139c187a
Jason Monk [Wed, 4 Nov 2015 15:12:06 +0000 (15:12 +0000)]
Merge "Don\'t show MIDI USB option if not supported" am:
c2a9cd03f7 am:
92aafd3ed5
am:
1150cfce95
* commit '
1150cfce95950f9de3e6e340b6d8efaf5bbd3eb0':
Don't show MIDI USB option if not supported
Julia Reynolds [Wed, 4 Nov 2015 15:11:41 +0000 (10:11 -0500)]
Null check in onPostExecute.
Change-Id: I8bc8c0b062583b4b9c54152c516f160df4f645e7
Jason Monk [Wed, 4 Nov 2015 15:02:47 +0000 (15:02 +0000)]
Merge "Don\'t show MIDI USB option if not supported" am:
c2a9cd03f7
am:
92aafd3ed5
* commit '
92aafd3ed5391eb5b172c54e6ea820dd36110c99':
Don't show MIDI USB option if not supported
Jason Monk [Wed, 4 Nov 2015 14:56:04 +0000 (14:56 +0000)]
Merge "Don\'t show MIDI USB option if not supported"
am:
c2a9cd03f7
* commit '
c2a9cd03f71b3b6b0af2f6faaf877fd9c75dd9fe':
Don't show MIDI USB option if not supported
Jason Monk [Wed, 4 Nov 2015 14:43:11 +0000 (14:43 +0000)]
Merge "Don't show MIDI USB option if not supported"
Zoran Jovanovic [Wed, 4 Nov 2015 13:00:03 +0000 (14:00 +0100)]
Don't show MIDI USB option if not supported
If device doesn't support MIDI, don't show MIDI in "Use USB for" menu
when USB cable is connected.
(Selecting MIDI will crash the Settings app.)
Change-Id: I60f4cbb6357f162fecb574cdb6766cf5ed92e78e
Geoff Mendal [Wed, 4 Nov 2015 14:12:42 +0000 (06:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: I53d143c94f79d2fc2e84f6e600d314ec8f1e15f9
Auto-generated-cl: translation import
Jim Miller [Wed, 4 Nov 2015 03:18:59 +0000 (19:18 -0800)]
Auto advance fingerprint enrollment when user taps on the sensor
Fixes bug
25244236
Change-Id: Ifba52a67f6cfcd3b3d17530300b0f5f0299cd688
Felipe Leme [Tue, 3 Nov 2015 22:30:22 +0000 (22:30 +0000)]
Merge "Minor changes on bug report settings on 'Developer options'."
Felipe Leme [Fri, 30 Oct 2015 21:35:54 +0000 (14:35 -0700)]
Minor changes on bug report settings on 'Developer options'.
1.Allows bug report options on all builds.
2.Associates bug report storage provider status to 'Bug report shortcut'
option.
3.Replaces deprecated constants.
BUG:
7436261
BUG:
24667178
Change-Id: I249ef6c168e2a8bc947efd6ac398a7a369089140
Alan Viverette [Tue, 3 Nov 2015 18:18:44 +0000 (13:18 -0500)]
Add display preference for scaling / UI Zoom feature
Bug:
22450672
Change-Id: If665576869743fd7d5fc23103260eecaa366e7aa
Tony Mantler [Fri, 30 Oct 2015 19:44:23 +0000 (12:44 -0700)]
Move more Accessibility stuff to SettingsLib
Change-Id: Id5dec8af86c1d4b0d98b169c4365410c2cee10b6
Jeff Sharkey [Fri, 30 Oct 2015 02:14:40 +0000 (19:14 -0700)]
Refresh storage UI when disk is destroyed.
Otherwise we leave stale items for the user to click on.
Bug:
25370499
Change-Id: Ia4492b7fb5a1a722bb92a583344677071ef07bba
Dianne Hackborn [Fri, 30 Oct 2015 17:31:09 +0000 (17:31 +0000)]
Merge "Further tweak to issue #issue #
25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am:
3b4e4dd91d am:
a42bad972c am:
44643bad26
am:
c271a8a00e
* commit '
c271a8a00e2686c371420406a12fd41c4a97e24d':
Further tweak to issue #issue #
25371736: Don't include z-ram allocations in Android OS
Dianne Hackborn [Fri, 30 Oct 2015 17:27:44 +0000 (17:27 +0000)]
Merge "Further tweak to issue #issue #
25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am:
3b4e4dd91d am:
a42bad972c
am:
44643bad26
* commit '
44643bad268fa65d8a5d95055a8a9c2c4bf86fdf':
Further tweak to issue #issue #
25371736: Don't include z-ram allocations in Android OS
Dianne Hackborn [Fri, 30 Oct 2015 17:24:34 +0000 (17:24 +0000)]
Merge "Further tweak to issue #issue #
25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am:
3b4e4dd91d
am:
a42bad972c
* commit '
a42bad972ca44f52ac84b3139198acc11dec0d4f':
Further tweak to issue #issue #
25371736: Don't include z-ram allocations in Android OS
Dianne Hackborn [Fri, 30 Oct 2015 17:20:13 +0000 (17:20 +0000)]
Merge "Further tweak to issue #issue #
25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev
am:
3b4e4dd91d
* commit '
3b4e4dd91d416c93fdc0326e54469ceabb8281ab':
Further tweak to issue #issue #
25371736: Don't include z-ram allocations in Android OS
Maurice Lam [Fri, 30 Oct 2015 17:17:57 +0000 (17:17 +0000)]
Merge "[WifiDialog] Guard with CHANGE_WIFI permission"
Dianne Hackborn [Fri, 30 Oct 2015 17:16:20 +0000 (17:16 +0000)]
Merge "Further tweak to issue #issue #
25371736: Don't include z-ram allocations in Android OS" into mnc-dr-dev
Jason Monk [Fri, 30 Oct 2015 16:51:09 +0000 (16:51 +0000)]
Merge "Fix accounts screen"
Jason Monk [Tue, 27 Oct 2015 14:14:09 +0000 (10:14 -0400)]
Fix accounts screen
Bug:
25212341
Change-Id: Ia8953b6a9fbbd4c90cd0eb327081c478420f7db6
Julia Reynolds [Fri, 30 Oct 2015 16:01:00 +0000 (16:01 +0000)]
Merge "Permission changes for DND Add Rule page."
Tony Mantler [Fri, 30 Oct 2015 15:59:11 +0000 (15:59 +0000)]
Merge "Move AccessibilityUtils to SettingsLib"
Julia Reynolds [Fri, 30 Oct 2015 12:26:12 +0000 (08:26 -0400)]
Permission changes for DND Add Rule page.
Don't whitelist CPs when visiting the Add Rule Page; update
the permission CPs are tracked by; don't show CPs in the add
rule dialog if the user hasn't whitelisted them.
Bug:
22977552
Change-Id: I8b363d7106de088e68b9659e3f0098848c6d3153
Dianne Hackborn [Fri, 30 Oct 2015 00:32:28 +0000 (17:32 -0700)]
Further tweak to issue #issue #
25371736: Don't include z-ram allocations in Android OS
Make sure the duration shown for z-ram is sane (the maximum of the
other process durations of that app).
Change-Id: I62c46b89f927b2c7c16f5c31f6910419b2bdd130
Dianne Hackborn [Thu, 29 Oct 2015 23:51:11 +0000 (23:51 +0000)]
Merge "Fix issue #
25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am:
508559d076 am:
68954d930d am:
2af9128966
am:
6ee79b2823
* commit '
6ee79b282346b976df98b2af214af4800fc68c26':
Fix issue #
25371736: Don't include z-ram allocations in Android OS
Dianne Hackborn [Thu, 29 Oct 2015 23:46:20 +0000 (23:46 +0000)]
Merge "Fix issue #
25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am:
508559d076 am:
68954d930d
am:
2af9128966
* commit '
2af9128966ee855d6c8e06479562cb141c625511':
Fix issue #
25371736: Don't include z-ram allocations in Android OS
Dianne Hackborn [Thu, 29 Oct 2015 23:43:04 +0000 (23:43 +0000)]
Merge "Fix issue #
25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am:
508559d076
am:
68954d930d
* commit '
68954d930d0a583c7150e1a3959d5a798b8e5f34':
Fix issue #
25371736: Don't include z-ram allocations in Android OS
Maurice Lam [Thu, 29 Oct 2015 23:40:49 +0000 (16:40 -0700)]
[WifiDialog] Guard with CHANGE_WIFI permission
Guard WifiDialogActivity with CHANGE_WIFI_STATE permission.
Bug:
25189534
Change-Id: I97e311f35873323c7db6a2e47f4155da6d73e9f6
Dianne Hackborn [Thu, 29 Oct 2015 23:39:39 +0000 (23:39 +0000)]
Merge "Fix issue #
25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev
am:
508559d076
* commit '
508559d0760596509f07fa56371c6e18d8bd9559':
Fix issue #
25371736: Don't include z-ram allocations in Android OS
Dianne Hackborn [Thu, 29 Oct 2015 23:36:14 +0000 (23:36 +0000)]
Merge "Fix issue #
25371736: Don't include z-ram allocations in Android OS" into mnc-dr-dev
Dianne Hackborn [Thu, 29 Oct 2015 20:34:51 +0000 (13:34 -0700)]
Fix issue #
25371736: Don't include z-ram allocations in Android OS
Just distribute them across all of the running apps, by creating
an additional fake "z-ram" process for each of them.
Change-Id: I9b4efe9c7b907779a0ec76cb8652709619e2e686
Tony Mantler [Thu, 29 Oct 2015 20:16:31 +0000 (13:16 -0700)]
Move AccessibilityUtils to SettingsLib
Change-Id: I1ad6b89e6dce1f7cad337b49774694f16479342b
Maurice Lam [Wed, 28 Oct 2015 17:32:03 +0000 (17:32 +0000)]
Merge "[WifiDialog] "Add network" return WifiConfig"
Julia Reynolds [Wed, 28 Oct 2015 14:34:41 +0000 (14:34 +0000)]
Merge "Temporarily reenable 3P condition providers."
Geoff Mendal [Wed, 28 Oct 2015 14:13:26 +0000 (14:13 +0000)]
Import translations. DO NOT MERGE am:
260d90a102 -s ours am:
04817defc9 -s ours am:
fe5582a26b -s ours
am:
b5497564ee -s ours
* commit '
b5497564eecfa8af6d86daa174faba523859fd55':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 14:10:08 +0000 (14:10 +0000)]
Import translations. DO NOT MERGE am:
260d90a102 -s ours am:
04817defc9 -s ours
am:
fe5582a26b -s ours
* commit '
fe5582a26b461482c51a163b76c2283ae96116eb':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 14:05:28 +0000 (14:05 +0000)]
Import translations. DO NOT MERGE am:
260d90a102 -s ours
am:
04817defc9 -s ours
* commit '
04817defc935af871ec90b971f61d4b31d28c97d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 14:00:31 +0000 (14:00 +0000)]
Import translations. DO NOT MERGE
am:
260d90a102 -s ours
* commit '
260d90a102b3a0d7ba51c5bf73d34291ef2f4910':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 13:55:41 +0000 (08:55 -0500)]
Import translations. DO NOT MERGE
Change-Id: I2c1d24dee82b74a8db0f2fa30077b71e085ca0cd
Auto-generated-cl: translation import
Julia Reynolds [Wed, 28 Oct 2015 13:46:39 +0000 (09:46 -0400)]
Temporarily reenable 3P condition providers.
This code will go away once there is a better way for a user to
approve 3P CPs.
Change-Id: I56a72d03a75c2c60f6f19f82f091d9a1c7f3f715
Geoff Mendal [Wed, 28 Oct 2015 13:14:45 +0000 (08:14 -0500)]
Import translations. DO NOT MERGE
Change-Id: Idbdba1c5697e8058cbe7ec5aa7b77f567ca73623
Auto-generated-cl: translation import
Philip P. Moltmann [Tue, 27 Oct 2015 19:56:48 +0000 (19:56 +0000)]
Merge "Deal with daylight savings time in battery chart."
Philip P. Moltmann [Tue, 27 Oct 2015 00:30:10 +0000 (17:30 -0700)]
Deal with daylight savings time in battery chart.
Without daylight saving time the middle between two beginnings of days
can only be another beginning of a day or noon. Due to daylight savings
time this can be shifted by up to one hour in either direction.
This change corrects the middle value.
Testing Done: Tried the calculation of the three values with Lisbon time
and
mStartWallTime = 1414254027000L;
mEndWallTime = 1414473627000L;
which spans over 10/26/2014, the day daylight saving ended in Lisbon.
Change-Id: I2d2ba6e1fd2e409ca3f6b0f7674ec250da7ffad5
Julia Reynolds [Tue, 27 Oct 2015 19:07:09 +0000 (19:07 +0000)]
Merge changes I3508c15a,I7b735ec0
* changes:
Always show rule creation option.
Remove some dead zen mode code.
Jorim Jaggi [Tue, 27 Oct 2015 09:54:53 +0000 (10:54 +0100)]
Add development option to force everything resizable
Bug:
24815256
Change-Id: Ic9620c3b502e92f1a628bbe696ae91896d25d5b3
Julia Reynolds [Tue, 27 Oct 2015 15:10:50 +0000 (11:10 -0400)]
Always show rule creation option.
Change-Id: I3508c15a0e9b727d7bc3dd63bd6482a623aaef5b
Julia Reynolds [Tue, 27 Oct 2015 12:40:47 +0000 (08:40 -0400)]
Remove some dead zen mode code.
Change-Id: I7b735ec0efff2a3758376d59e93df0e0e1530653
Geoff Mendal [Tue, 27 Oct 2015 04:51:06 +0000 (04:51 +0000)]
Import translations. DO NOT MERGE am:
c338bacb59 -s ours am:
884a8bbe78 -s ours am:
436fcc47fc -s ours
am:
80f2b5430e -s ours
* commit '
80f2b5430e3a448d9c818e33ceff9cd674ecbbda':
Import translations. DO NOT MERGE
Makoto Onuki [Mon, 26 Oct 2015 21:37:08 +0000 (21:37 +0000)]
Merge "Do not use UM.setUserRestrictions() in Settings"
Makoto Onuki [Thu, 15 Oct 2015 21:20:03 +0000 (14:20 -0700)]
Do not use UM.setUserRestrictions() in Settings
Change-Id: I014fe939f3495521a813eadbb7353956afc3feb4
Tony Mantler [Mon, 26 Oct 2015 18:39:14 +0000 (18:39 +0000)]
Merge "Move some app methods to AppUtils in SettingsLib"
Tony Mantler [Wed, 21 Oct 2015 18:30:10 +0000 (11:30 -0700)]
Move some app methods to AppUtils in SettingsLib
Change-Id: I1503e9d0e35c57aae32f90ff2c148cf1b75dcf05
Geoff Mendal [Mon, 26 Oct 2015 14:22:41 +0000 (14:22 +0000)]
Import translations. DO NOT MERGE am:
c338bacb59 -s ours am:
884a8bbe78 -s ours
am:
436fcc47fc -s ours
* commit '
436fcc47fce217f4c2b6301fe94fa87ffd6c0dbe':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 14:17:02 +0000 (14:17 +0000)]
Import translations. DO NOT MERGE am:
c338bacb59 -s ours
am:
884a8bbe78 -s ours
* commit '
884a8bbe7872e8d7aa94f854e4057d2d073cd09a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 14:13:23 +0000 (14:13 +0000)]
Import translations. DO NOT MERGE
am:
c338bacb59 -s ours
* commit '
c338bacb59b13bed45239a587e3429b4bed00a71':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 14:03:05 +0000 (07:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I63ec2877912de3a9884975bfa5fee6849d0d191f
Auto-generated-cl: translation import
Alan Viverette [Mon, 26 Oct 2015 14:01:18 +0000 (14:01 +0000)]
Merge "Let the framework handle long clicks"
Geoff Mendal [Mon, 26 Oct 2015 13:16:59 +0000 (06:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie5ca7c43f166e71719b8196efc96386f5f56241b
Auto-generated-cl: translation import
Alan Viverette [Fri, 23 Oct 2015 14:49:23 +0000 (10:49 -0400)]
Let the framework handle long clicks
If we manually propagate long click events, the framework can't include
coordinate information and we'll only be able to show a modal dialog.
Since the default long-click behavior is to show the context menu, just
let the framework handle it.
Bug:
25214386
Change-Id: I32e14b326ac91cc5a9c2bf7581325daaba34298e
Clara Bayarri [Fri, 16 Oct 2015 11:36:57 +0000 (12:36 +0100)]
Disable passphrase change flow encryption screen when not main user
When the user changing passphrase is not the process' user, disable
the "Ask for password on device startup" screen, as it makes no sense.
Change-Id: I521b5ec8702f7a39b94012a606794e04135e4c75
Clara Bayarri [Fri, 23 Oct 2015 10:13:37 +0000 (10:13 +0000)]
Merge "Refactor Choose/Confirm Lock flow to take user id"
Maurice Lam [Thu, 22 Oct 2015 23:57:50 +0000 (16:57 -0700)]
[WifiDialog] "Add network" return WifiConfig
When adding a network by manually entering SSID, return the wifi
configuration to the caller.
Change-Id: If490a341fe95b9c63f43d3bb30a2114bfcd45082
Jason Monk [Thu, 22 Oct 2015 23:48:54 +0000 (23:48 +0000)]
Fix crash in Settings from uninstall am:
6e2e8e17cf am:
34d6ea560d am:
eccc9b3962
am:
652ba5e22e
* commit '
652ba5e22e86fe031ca080f5bfe032f27008989a':
Fix crash in Settings from uninstall
Jason Monk [Thu, 22 Oct 2015 23:42:14 +0000 (23:42 +0000)]
Fix crash in Settings from uninstall am:
6e2e8e17cf am:
34d6ea560d
am:
eccc9b3962
* commit '
eccc9b39626c525763e5590728f413e4d7ff8cf5':
Fix crash in Settings from uninstall
Jason Monk [Thu, 22 Oct 2015 23:37:48 +0000 (23:37 +0000)]
Fix crash in Settings from uninstall am:
6e2e8e17cf
am:
34d6ea560d
* commit '
34d6ea560d3935eef6e53e93d5bb7ba1a8148965':
Fix crash in Settings from uninstall
Jason Monk [Thu, 22 Oct 2015 23:12:02 +0000 (23:12 +0000)]
Fix crash in Settings from uninstall
am:
6e2e8e17cf
* commit '
6e2e8e17cfea09548067baa8b361dbc31dce385c':
Fix crash in Settings from uninstall
Jason Monk [Thu, 22 Oct 2015 22:32:08 +0000 (15:32 -0700)]
Fix crash in Settings from uninstall
Bug:
25171390
Change-Id: Idd0319a5c003ba2183264684806d2b0aaffa1d7e
Maurice Lam [Thu, 22 Oct 2015 19:52:05 +0000 (19:52 +0000)]
Merge "[WifiDialog] Allow adding unspecified AP"
Maurice Lam [Thu, 22 Oct 2015 18:39:26 +0000 (11:39 -0700)]
[WifiDialog] Allow adding unspecified AP
In WifiDialogActivity, handle the case where the given
accessPointState is null, and show the Wi-Fi dialog allowing users
to enter the SSID and other credentials. This will be used by setup
wizard when user selected "Add new network" item.
Bug:
23392285
Change-Id: Ica2650d9e829d73281bc9c504c3005d9c5750d31
Xiaohui Chen [Wed, 21 Oct 2015 21:49:49 +0000 (21:49 +0000)]
Merge "Clean up UserHandle.isOwner() in settings"
Xiaohui Chen [Wed, 21 Oct 2015 18:25:35 +0000 (11:25 -0700)]
Clean up UserHandle.isOwner() in settings
Bug:
24869636
Change-Id: I9cb05a7543024136935902047952f582ae57c07c
Geoff Mendal [Wed, 21 Oct 2015 16:52:58 +0000 (16:52 +0000)]
Import translations. DO NOT MERGE am:
a489856def -s ours am:
f3ad526200 -s ours am:
79e81bca9c -s ours
am:
af6440fb19 -s ours
* commit '
af6440fb1992cfc5a1f1c3127d98a72feb82a9f4':
Import translations. DO NOT MERGE