git.osdn.net Git - android-x86/packages-apps-Settings.git/log

Michael Wright [Tue, 3 May 2016 18:43:47 +0000 (18:43 +0000)]

Merge "Add subtext for default keyboard layout." into nyc-dev am: 12c2c2538b am: e71a6ac6cd
am: 9a4e28a538

* commit '9a4e28a5389967133322c72a481104863337a3f7':

Change-Id: Ia066b7d68a6a46330cd4e62ed7bd9004105a0611

commit | commitdiff | tree

Michael Wright [Tue, 3 May 2016 18:43:46 +0000 (18:43 +0000)]

Merge "Add subtext for default keyboard layout." into nyc-dev am: 12c2c2538b am: df824969af
am: 8a2d933b58

* commit '8a2d933b58f60d7c295428c162057a09abe6e7de':
Add subtext for default keyboard layout.

Change-Id: I7056e5bf83b5e3140df45c4d8b6b4b9cf0eedcc6

commit | commitdiff | tree

Michael Wright [Tue, 3 May 2016 18:39:09 +0000 (18:39 +0000)]

Merge "Add subtext for default keyboard layout." into nyc-dev am: 12c2c2538b
am: e71a6ac6cd

* commit 'e71a6ac6cdcbca69a0f759211b8a08724b7701d8':

Change-Id: I5761dcceb05a7dea7e7d212fa7c7cf765be956d0

commit | commitdiff | tree

Michael Wright [Tue, 3 May 2016 18:36:48 +0000 (18:36 +0000)]

Merge "Add subtext for default keyboard layout." into nyc-dev am: 12c2c2538b
am: df824969af

* commit 'df824969af786598f951830bd6ec387606da316a':
Add subtext for default keyboard layout.

Change-Id: I3f2802ca95c8c0b95967dd52fdc664544f6eeccf

commit | commitdiff | tree

Michael Wright [Tue, 3 May 2016 18:34:18 +0000 (18:34 +0000)]

Merge "Add subtext for default keyboard layout." into nyc-dev
am: 12c2c2538b

* commit '12c2c2538b1e87f1a2d75f001772719bca9ab8f4':
Add subtext for default keyboard layout.

Change-Id: Idd3946011f5f516c444973ce0f06381efe44cda9

commit | commitdiff | tree

Michael Wright [Tue, 3 May 2016 18:34:17 +0000 (18:34 +0000)]

commit | commitdiff | tree

Michael Wright [Tue, 3 May 2016 18:28:59 +0000 (18:28 +0000)]

Merge "Add subtext for default keyboard layout." into nyc-dev

commit | commitdiff | tree

Michael Wright [Tue, 3 May 2016 13:32:32 +0000 (14:32 +0100)]

Add subtext for default keyboard layout.

Bug: 27742933
Change-Id: I51bec339c0cbcfb114f85758b6a227deb57a69e2

commit | commitdiff | tree

Baligh Uddin [Tue, 3 May 2016 17:04:55 +0000 (17:04 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: e6a875576f -s ours am: 5c4e2d741a -s ours
am: f83c49d66f -s ours

* commit 'f83c49d66f08dadd90850ffcf7a157e5b92f2513':

Change-Id: I0e89141dba753387a97fe5e95d8dc0877c6e7372

commit | commitdiff | tree

Baligh Uddin [Tue, 3 May 2016 17:04:54 +0000 (17:04 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: ad4773b774  -s ours
am: 688225bea8  -s ours

* commit '688225bea85a5288597ae6471879000c45306781':
  Import translations. DO NOT MERGE

Change-Id: I451a826c2ae7aea9b625b96531920907703c4615

commit | commitdiff | tree

Baligh Uddin [Tue, 3 May 2016 17:04:51 +0000 (17:04 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: e6a875576f  -s ours am: 8c648f3fd5  -s ours
am: 8a4276a2ab  -s ours

* commit '8a4276a2ab6f5db38c3c9b21d8f0aa3d321a8426':
  Import translations. DO NOT MERGE

Change-Id: Iedf970a73e6efb991c869a5ff791fd2b4b052be0

commit | commitdiff | tree

Baligh Uddin [Tue, 3 May 2016 16:54:27 +0000 (16:54 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: e6a875576f -s ours
am: 5c4e2d741a -s ours

* commit '5c4e2d741a296a7da00e94bafa70b191e9702fed':

Change-Id: Ia43a5b595a0807dfc59135010925f6254a2fe723

commit | commitdiff | tree

Baligh Uddin [Tue, 3 May 2016 16:54:25 +0000 (16:54 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: ad4773b774 -s ours

* commit 'ad4773b774d905bfcccc3d1dbb45d0f0c27bc12e':
Import translations. DO NOT MERGE

Change-Id: Ia1afdb49580d23fbe60f22f458d169c62bea1e3b

commit | commitdiff | tree

Baligh Uddin [Tue, 3 May 2016 16:51:27 +0000 (16:51 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: e6a875576f  -s ours
am: 8c648f3fd5  -s ours

* commit '8c648f3fd5b3dc776f52a72b4d248cfa0baba655':
  Import translations. DO NOT MERGE

Change-Id: I49326528232aaac98c1b6830bc35505ff86ccbfc

commit | commitdiff | tree

Baligh Uddin [Tue, 3 May 2016 16:49:06 +0000 (16:49 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev
am: e6a875576f -s ours

* commit 'e6a875576f3713c755c5bbca855b43b1048b3618':
Import translations. DO NOT MERGE

Change-Id: Ia280336dd979aee7c6faf76fc77bef275f2b6285

commit | commitdiff | tree

Baligh Uddin [Tue, 3 May 2016 16:49:04 +0000 (16:49 +0000)]

commit | commitdiff | tree

Baligh Uddin [Tue, 3 May 2016 16:41:20 +0000 (16:41 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Tue, 3 May 2016 16:41:17 +0000 (16:41 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev

commit | commitdiff | tree

Baligh Uddin [Tue, 3 May 2016 16:41:11 +0000 (16:41 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Baligh Uddin [Tue, 3 May 2016 08:39:46 +0000 (01:39 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ief7fdf92fd579e99764edbf2438caa44d6735da7
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Tue, 3 May 2016 08:25:52 +0000 (01:25 -0700)]

Import translations. DO NOT MERGE

Change-Id: If49388814aafcf05ad9b1899b7e991463c8c3662
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Tue, 3 May 2016 07:30:42 +0000 (00:30 -0700)]

Import translations. DO NOT MERGE

Change-Id: If2bd78844cb256f0ae348be37369466f0deb01fe
Auto-generated-cl: translation import

commit | commitdiff | tree

Philip P. Moltmann [Mon, 2 May 2016 23:35:48 +0000 (23:35 +0000)]

Merge "Merge "Read disk ID from intent" into nyc-dev am: e0e7fa4501 am: fe99c4282e" into nyc-mr1-dev-plus-aosp
am: 036e33402c

* commit '036e33402cb5eb03f5f15c40b070e17eeebbb0ec':

Change-Id: Icc5796dd3b760a82794815b21db1aeefc42ab948

commit | commitdiff | tree

Philip P. Moltmann [Mon, 2 May 2016 23:35:47 +0000 (23:35 +0000)]

Merge "Merge "Read disk ID from intent" into nyc-dev am: e0e7fa4501 am: fe99c4282e" into nyc-mr1-dev-plus-aosp
am: 171748e950

* commit '171748e9509aaf30e4fad0afbf8e81086f3c1408':

Change-Id: Ibd71bbc84bc02aa0e6b25956058c8c1079bb0119

commit | commitdiff | tree

Philip P. Moltmann [Mon, 2 May 2016 23:35:46 +0000 (23:35 +0000)]

Merge "Read disk ID from intent" into nyc-dev am: e0e7fa4501 am: 0c71d3b5cf
am: 6a2c269a4c

* commit '6a2c269a4c53e51ad72f96b8ecc64c91048e1acc':
Read disk ID from intent

Change-Id: Id9c13a8dc72c11601d3309a28c4cd54a30494fff

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 May 2016 23:30:38 +0000 (23:30 +0000)]

Merge "Merge "Read disk ID from intent" into nyc-dev am: e0e7fa4501 am: fe99c4282e" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Philip P. Moltmann [Mon, 2 May 2016 23:30:32 +0000 (23:30 +0000)]

Merge "Read disk ID from intent" into nyc-dev am: e0e7fa4501
am: fe99c4282e

* commit 'fe99c4282e8e8a057c9519b93640c09ffe8e628a':

Change-Id: Ice23b0a3c9fc625f378e9073bdd2c12f2b2e51a3

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 May 2016 23:29:54 +0000 (23:29 +0000)]

Merge "Merge "Read disk ID from intent" into nyc-dev am: e0e7fa4501 am: fe99c4282e" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Philip P. Moltmann [Mon, 2 May 2016 23:29:45 +0000 (23:29 +0000)]

Merge "Read disk ID from intent" into nyc-dev am: e0e7fa4501
am: fe99c4282e

* commit 'fe99c4282e8e8a057c9519b93640c09ffe8e628a':
Read disk ID from intent

Change-Id: Ifb0d8f693059943f78e07ff90bec8b355998b23e

commit | commitdiff | tree

Philip P. Moltmann [Mon, 2 May 2016 23:29:43 +0000 (23:29 +0000)]

Merge "Read disk ID from intent" into nyc-dev am: e0e7fa4501
am: 0c71d3b5cf

* commit '0c71d3b5cfbe14bb531ce3c94838ec84ef84d96b':
Read disk ID from intent

Change-Id: I3854c5c6f17789e5bdfa16b5c4c7ff9ca635b4d1

commit | commitdiff | tree

Philip P. Moltmann [Mon, 2 May 2016 23:24:05 +0000 (23:24 +0000)]

Merge "Read disk ID from intent" into nyc-dev
am: e0e7fa4501

* commit 'e0e7fa4501214be7c2cdf0fbf3e503d54504bd3f':
Read disk ID from intent

Change-Id: Ia40f3b5901385cf22ddadc37131f464dbee93b2b

commit | commitdiff | tree

Philip P. Moltmann [Mon, 2 May 2016 23:24:05 +0000 (23:24 +0000)]

Merge "Read disk ID from intent" into nyc-dev
am: e0e7fa4501

* commit 'e0e7fa4501214be7c2cdf0fbf3e503d54504bd3f':
Read disk ID from intent

Change-Id: Ifd8786add5110d6556a0974d1e0379e68490acb4

commit | commitdiff | tree

Philip P. Moltmann [Mon, 2 May 2016 23:00:30 +0000 (23:00 +0000)]

Merge "Read disk ID from intent" into nyc-dev

commit | commitdiff | tree

Sudheer Shanka [Mon, 2 May 2016 20:34:00 +0000 (20:34 +0000)]

Merge "Show app installer info even if it doesn\'t handle ACTION.APP_SHOW_INFO." into nyc-dev am: 57e6a9144a am: 000293cbb9
am: 4fe4ff0efb

* commit '4fe4ff0efbecfd6a06fe7049fd71df86a34c0c48':

Change-Id: Iaa84c1cb436b5aebecfe0f819ea5a118e9f10357

commit | commitdiff | tree

Sudheer Shanka [Mon, 2 May 2016 20:23:09 +0000 (20:23 +0000)]

Merge "Show app installer info even if it doesn\'t handle ACTION.APP_SHOW_INFO." into nyc-dev am: 57e6a9144a
am: 000293cbb9

* commit '000293cbb962faf0defc294e0903617085ac45b4':

Change-Id: Ib0c380158917dfd24233e06faea8ab1c241f326b

commit | commitdiff | tree

Sudheer Shanka [Mon, 2 May 2016 20:22:59 +0000 (20:22 +0000)]

Merge "Show app installer info even if it doesn\'t handle ACTION.APP_SHOW_INFO." into nyc-dev am: 57e6a9144a am: 0814dfbccb
am: 1d7972ebaa

* commit '1d7972ebaa4c3fd468271b0df9a684a9c152bb21':
Show app installer info even if it doesn't handle ACTION.APP_SHOW_INFO.

Change-Id: I6cf133d62a197efea479404b22a36acdaf440f16

commit | commitdiff | tree

Sudheer Shanka [Mon, 2 May 2016 20:17:21 +0000 (20:17 +0000)]

Merge "Show app installer info even if it doesn\'t handle ACTION.APP_SHOW_INFO." into nyc-dev am: 57e6a9144a
am: 0814dfbccb

* commit '0814dfbccb5bff8a7cbf2c60d8b835d7207a3b45':
Show app installer info even if it doesn't handle ACTION.APP_SHOW_INFO.

Change-Id: I315ecc2c7583ea17e56861a1b2b78b5bdf07a7e1

commit | commitdiff | tree

Sudheer Shanka [Mon, 2 May 2016 20:09:59 +0000 (20:09 +0000)]

Merge "Show app installer info even if it doesn\'t handle ACTION.APP_SHOW_INFO." into nyc-dev
am: 57e6a9144a

* commit '57e6a9144a0577308bd9888f3498c17ca96e4f5f':
Show app installer info even if it doesn't handle ACTION.APP_SHOW_INFO.

Change-Id: I348e39f6519c3d620b7f3a3cba6eca72118339a9

commit | commitdiff | tree

Sudheer Shanka [Mon, 2 May 2016 20:09:58 +0000 (20:09 +0000)]

commit | commitdiff | tree

Sudheer Shanka [Mon, 2 May 2016 20:00:45 +0000 (20:00 +0000)]

Merge "Show app installer info even if it doesn't handle ACTION.APP_SHOW_INFO." into nyc-dev

commit | commitdiff | tree

Maurice Lam [Mon, 2 May 2016 18:14:58 +0000 (18:14 +0000)]

Merge "Merge "Remove top padding only if illustration is present" into nyc-dev am: 0e4816efb9 am: ec3fec5f94" into nyc-mr1-dev-plus-aosp
am: e03e92503d

* commit 'e03e92503db35cd7ea96e78da27f27eadc3b5e74':

Change-Id: I030e837f2f416f908bc7e08efb34773650265a78

commit | commitdiff | tree

Maurice Lam [Mon, 2 May 2016 18:14:57 +0000 (18:14 +0000)]

Merge "Remove top padding only if illustration is present" into nyc-dev am: 0e4816efb9 am: 0f27a312b7
am: 114ce05d7f

* commit '114ce05d7f2c487dccf0098440375e2865756c68':
Remove top padding only if illustration is present

Change-Id: Ie16353f5d99034be57a070b07f8023c6382555cb

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 May 2016 18:10:37 +0000 (18:10 +0000)]

Merge "Merge "Remove top padding only if illustration is present" into nyc-dev am: 0e4816efb9 am: ec3fec5f94" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Maurice Lam [Mon, 2 May 2016 18:10:21 +0000 (18:10 +0000)]

Merge "Remove top padding only if illustration is present" into nyc-dev am: 0e4816efb9
am: ec3fec5f94

* commit 'ec3fec5f94c5429433a1dd7c87cb40cd6a035efb':
Remove top padding only if illustration is present

Change-Id: Ie08a1d1ef54e32af85b5d3d312e6d5563ab3a822

commit | commitdiff | tree

Maurice Lam [Mon, 2 May 2016 18:10:09 +0000 (18:10 +0000)]

Merge "Remove top padding only if illustration is present" into nyc-dev am: 0e4816efb9
am: 0f27a312b7

* commit '0f27a312b7f8dd94443d8ccedc7e9e0debf49e3d':
Remove top padding only if illustration is present

Change-Id: I88243769eecf9a4ba373bc48bd40cca4308c626a

commit | commitdiff | tree

Maurice Lam [Mon, 2 May 2016 18:05:27 +0000 (18:05 +0000)]

Merge "Remove top padding only if illustration is present" into nyc-dev
am: 0e4816efb9

* commit '0e4816efb99e28a25efecee1702c552bfb9ba849':
Remove top padding only if illustration is present

Change-Id: I0b92a87785df54ca66427a4e3871f0ed4737b55f

commit | commitdiff | tree

Maurice Lam [Mon, 2 May 2016 18:05:23 +0000 (18:05 +0000)]

commit | commitdiff | tree

Maurice Lam [Mon, 2 May 2016 17:58:10 +0000 (17:58 +0000)]

Merge "Remove top padding only if illustration is present" into nyc-dev

commit | commitdiff | tree

Fan Zhang [Mon, 2 May 2016 17:09:39 +0000 (17:09 +0000)]

Merge "Explicitly setAccount in the same way as setHasInternet." into nyc-mr1-dev am: ac74071630
am: e0fc6404a3

* commit 'e0fc6404a3b0d3858451f9e65efbf805fbc32740':
Explicitly setAccount in the same way as setHasInternet.

Change-Id: I4196227ac087bcadfec1a20f969edc7dba2016b5

commit | commitdiff | tree

Fan Zhang [Mon, 2 May 2016 17:05:46 +0000 (17:05 +0000)]

Merge "Explicitly setAccount in the same way as setHasInternet." into nyc-mr1-dev
am: ac74071630

* commit 'ac7407163096e3a743e95d452a1d9675d17734b9':
Explicitly setAccount in the same way as setHasInternet.

Change-Id: I4845a410b7c8a79d9f7e83e6216bb75044c4fae5

commit | commitdiff | tree

Fan Zhang [Mon, 2 May 2016 16:57:11 +0000 (16:57 +0000)]

Merge "Explicitly setAccount in the same way as setHasInternet." into nyc-mr1-dev

commit | commitdiff | tree

Fan Zhang [Fri, 29 Apr 2016 20:05:49 +0000 (13:05 -0700)]

Explicitly setAccount in the same way as setHasInternet.

Bug: 28141203

This frees adapter from updating account and internet internally, and
allows refreshData() be private.

Change-Id: I8ccb4311c48c66222ee19e2d01b1c4943acdb0ee

commit | commitdiff | tree

Adrian Roos [Mon, 2 May 2016 15:29:23 +0000 (15:29 +0000)]

Merge "Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am: 820d7c85c7 am: c14a9af008" into nyc-mr1-dev-plus-aosp
am: 85a16e6ca9

* commit '85a16e6ca9900c48dd3a6588230c418bc8b2cb9b':

Change-Id: I6795f46dd3496555efd3120d11c96a68f6e0dd29

commit | commitdiff | tree

Adrian Roos [Mon, 2 May 2016 15:29:22 +0000 (15:29 +0000)]

Merge "Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am: 820d7c85c7 am: c14a9af008" into nyc-mr1-dev-plus-aosp
am: d0b92c27f6

* commit 'd0b92c27f6e19e6318471527774052414b37581f':

Change-Id: Iacfa6b929a6ec76a8500d2a2f00a377ad2536f20

commit | commitdiff | tree

Adrian Roos [Mon, 2 May 2016 15:29:21 +0000 (15:29 +0000)]

Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am: 820d7c85c7 am: 3b8cc35b4a
am: e7b9a582e7

* commit 'e7b9a582e7d13881ec39199b5a457bf467d8d99d':
Properly handle rotation in NotificationLockscreenPreference

Change-Id: I15eda9892b43b2d835c8a938ccdc7fc297b91a56

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 May 2016 15:26:11 +0000 (15:26 +0000)]

Merge "Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am: 820d7c85c7 am: c14a9af008" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Adrian Roos [Mon, 2 May 2016 15:26:03 +0000 (15:26 +0000)]

Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am: 820d7c85c7
am: c14a9af008

* commit 'c14a9af0082efdab768a46d0de82cfdbbeb97d3c':

Change-Id: I40a3e59abcc38e11102e93b2e4c40daca0d23eda

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 May 2016 15:25:22 +0000 (15:25 +0000)]

Merge "Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am: 820d7c85c7 am: c14a9af008" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Adrian Roos [Mon, 2 May 2016 15:25:13 +0000 (15:25 +0000)]

Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am: 820d7c85c7
am: c14a9af008

* commit 'c14a9af0082efdab768a46d0de82cfdbbeb97d3c':
Properly handle rotation in NotificationLockscreenPreference

Change-Id: I449720787279e53eca1e8a413519ba8fa71202ed

commit | commitdiff | tree

Adrian Roos [Mon, 2 May 2016 15:25:12 +0000 (15:25 +0000)]

Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am: 820d7c85c7
am: 3b8cc35b4a

* commit '3b8cc35b4ae79b6bbf0d7793b35df10f830d06f2':
Properly handle rotation in NotificationLockscreenPreference

Change-Id: I777028cb4d4b7120c538edc35928f1508743308f

commit | commitdiff | tree

Adrian Roos [Mon, 2 May 2016 15:21:02 +0000 (15:21 +0000)]

Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev
am: 820d7c85c7

* commit '820d7c85c724b28267b1a5d0dee8b190f49d8517':
Properly handle rotation in NotificationLockscreenPreference

Change-Id: I67be3fb9333356f0e1e7fa3de7c4a3838554b32a

commit | commitdiff | tree

Adrian Roos [Mon, 2 May 2016 15:21:02 +0000 (15:21 +0000)]

commit | commitdiff | tree

Adrian Roos [Mon, 2 May 2016 15:13:40 +0000 (15:13 +0000)]

Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev

commit | commitdiff | tree

Philip P. Moltmann [Fri, 29 Apr 2016 23:35:28 +0000 (16:35 -0700)]

Read disk ID from intent

mDisk might be null, but we can recover the disk ID from the original
Intent.

Bug: 28177789
Change-Id: Ic3e33a60084c42eb0bb06145ad50a45077e650d0

commit | commitdiff | tree

Maurice Lam [Fri, 29 Apr 2016 22:07:40 +0000 (15:07 -0700)]

Remove top padding only if illustration is present

Bug: 28469515
Change-Id: Ifc41b09b2b1675b696291753ff68fe4a801c76c2

commit | commitdiff | tree

Adrian Roos [Fri, 29 Apr 2016 21:37:02 +0000 (14:37 -0700)]

Properly handle rotation in NotificationLockscreenPreference

There were some issues because we didn't explicitly
track and restore the selected position upon rotating,
so the fragment's oppinion of which item was selected
didn't match the ListView's.

Change-Id: Ia86e25dab36b44931297f8bcc7bcb7d6974f4b76
Fixes: 27921546

commit | commitdiff | tree

Jason Monk [Fri, 29 Apr 2016 19:03:16 +0000 (19:03 +0000)]

Merge "Merge "Don\'t crash on Settings data usage" into nyc-dev am: b60c7560af am: fc63188c2c" into nyc-mr1-dev-plus-aosp
am: b5cbaa27f7

* commit 'b5cbaa27f7bca6321760e757c8cb3135e1518446':

Change-Id: Iccb72b39c82b583feb7bd97b9801b48a1ad6925a

commit | commitdiff | tree

Jason Monk [Fri, 29 Apr 2016 19:03:15 +0000 (19:03 +0000)]

Merge "Don\'t crash on Settings data usage" into nyc-dev am: b60c7560af am: 4b32f9f5ad
am: e8b198b606

* commit 'e8b198b606e318b2f9f3f98b7225299e53e28645':
Don't crash on Settings data usage

Change-Id: I9aa40cdc9af7d65f8e02bb18be4464bb553a4c49

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 29 Apr 2016 19:01:10 +0000 (19:01 +0000)]

Merge "Merge "Don\'t crash on Settings data usage" into nyc-dev am: b60c7560af am: fc63188c2c" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jason Monk [Fri, 29 Apr 2016 19:01:01 +0000 (19:01 +0000)]

Merge "Don\'t crash on Settings data usage" into nyc-dev am: b60c7560af
am: fc63188c2c

* commit 'fc63188c2cbb6fbda340c9f8c9c7b4541b160912':
Don't crash on Settings data usage

Change-Id: Iada79f9953fea61a164ddac887dff6aafce14553

commit | commitdiff | tree

Jason Monk [Fri, 29 Apr 2016 19:01:00 +0000 (19:01 +0000)]

Merge "Don\'t crash on Settings data usage" into nyc-dev am: b60c7560af
am: 4b32f9f5ad

* commit '4b32f9f5ada3f3eec32409c8188bb15e39bdea4b':
Don't crash on Settings data usage

Change-Id: I9f345c6c8fd278c15ca1eb8453581cee6e553323

commit | commitdiff | tree

Jason Monk [Fri, 29 Apr 2016 18:58:41 +0000 (18:58 +0000)]

Merge "Don\'t crash on Settings data usage" into nyc-dev
am: b60c7560af

* commit 'b60c7560afe6c4326d9e77423b31e0dcbf452506':
Don't crash on Settings data usage

Change-Id: I6227d2797bdbe49758885a4c48f20e6013f30be7

commit | commitdiff | tree

Jason Monk [Fri, 29 Apr 2016 18:58:41 +0000 (18:58 +0000)]

commit | commitdiff | tree

Jason Monk [Fri, 29 Apr 2016 18:54:08 +0000 (18:54 +0000)]

Merge "Don't crash on Settings data usage" into nyc-dev

commit | commitdiff | tree

Fan Zhang [Fri, 29 Apr 2016 18:31:46 +0000 (18:31 +0000)]

Merge "Disable stable id in support adapter." into nyc-mr1-dev am: 7efc40797a
am: bbe5bbb453

* commit 'bbe5bbb453fb5a2b297c46edd7c0461e6d2c5f6d':
Disable stable id in support adapter.

Change-Id: I09d945cb62c273e64ae8c23bc4edcdb1228f1b8b

commit | commitdiff | tree

Fan Zhang [Fri, 29 Apr 2016 18:29:30 +0000 (18:29 +0000)]

Merge "Disable stable id in support adapter." into nyc-mr1-dev
am: 7efc40797a

* commit '7efc40797af03adc9b56e9f87acba4fa4d659940':
Disable stable id in support adapter.

Change-Id: Ic7cb02dd709876b88e602aa0b37aaa5e8e0898e8

commit | commitdiff | tree

Fan Zhang [Fri, 29 Apr 2016 18:20:50 +0000 (18:20 +0000)]

Merge "Disable stable id in support adapter." into nyc-mr1-dev

commit | commitdiff | tree

Jason Monk [Fri, 29 Apr 2016 18:06:10 +0000 (14:06 -0400)]

Don't crash on Settings data usage

Consider Settings uid (SYSTEM_UID) to be an app.

Change-Id: Ia5cc7897eafdf3d654e8a23715bd25502097bab8
Fixes: 28193076

commit | commitdiff | tree

Jason Monk [Fri, 29 Apr 2016 18:02:15 +0000 (18:02 +0000)]

Merge "Merge "Don\'t crash settings when out of space." into nyc-dev am: a1fe122b99 am: cf5a448ce5" into nyc-mr1-dev-plus-aosp
am: 0044da3ede

* commit '0044da3edec38f3482bea5d59e051ff9bcd6aeb1':

Change-Id: I30bac4c6654e1a2ae21d3a5daa76b2af1a6f2588

commit | commitdiff | tree

Jason Monk [Fri, 29 Apr 2016 18:02:15 +0000 (18:02 +0000)]

Merge "Don\'t crash settings when out of space." into nyc-dev am: a1fe122b99 am: cd5d6137bc
am: 1b997d2cd9

* commit '1b997d2cd966c7e7c73a37bc8343f60755dc30b2':
Don't crash settings when out of space.

Change-Id: I4ed32a93c8d53e283af7c4884d2aae3876727801

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 29 Apr 2016 17:59:52 +0000 (17:59 +0000)]

Merge "Merge "Don\'t crash settings when out of space." into nyc-dev am: a1fe122b99 am: cf5a448ce5" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jason Monk [Fri, 29 Apr 2016 17:59:47 +0000 (17:59 +0000)]

Merge "Don\'t crash settings when out of space." into nyc-dev am: a1fe122b99
am: cf5a448ce5

* commit 'cf5a448ce57883088fa7f6b3d6683065e266470f':
Don't crash settings when out of space.

Change-Id: I3772a8b5210130f3cfbf4c7b6fe5d487eb9ace53

commit | commitdiff | tree

Jason Monk [Fri, 29 Apr 2016 17:59:36 +0000 (17:59 +0000)]

Merge "Don\'t crash settings when out of space." into nyc-dev am: a1fe122b99
am: cd5d6137bc

* commit 'cd5d6137bc893f21928f6e77c70963780fc6e159':
Don't crash settings when out of space.

Change-Id: I04e91645bb1e35b28ab1900d1f172d0633e2dc11

commit | commitdiff | tree

Jason Monk [Fri, 29 Apr 2016 17:57:27 +0000 (17:57 +0000)]

Merge "Don\'t crash settings when out of space." into nyc-dev
am: a1fe122b99

* commit 'a1fe122b99a89e13ef3e06364df519ca93a35dcc':
Don't crash settings when out of space.

Change-Id: Id336b4dcf1ab7fce3581286d598cf590c4973548

commit | commitdiff | tree

Jason Monk [Fri, 29 Apr 2016 17:57:24 +0000 (17:57 +0000)]

commit | commitdiff | tree

Mihai Niță [Fri, 29 Apr 2016 17:55:10 +0000 (17:55 +0000)]

Merge "Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am: 7dce005fab am: f02a31beaa" into nyc-mr1-dev-plus-aosp
am: 78127f0e01

* commit '78127f0e01351b0cf9a59f6725b04ba80c11b274':

Change-Id: I6d934601a5ea21736157317d917c402787176853

commit | commitdiff | tree

Mihai Niță [Fri, 29 Apr 2016 17:55:09 +0000 (17:55 +0000)]

Merge "Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am: 7dce005fab am: f02a31beaa" into nyc-mr1-dev-plus-aosp
am: 0d342e624d

* commit '0d342e624d1525aad7938636d3a4950e73a1f55f':

Change-Id: I86cc3838071e559e5191903a43d3e75852ddf8b0

commit | commitdiff | tree

Mihai Nita [Fri, 29 Apr 2016 17:55:09 +0000 (17:55 +0000)]

Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am: 7dce005fab am: 48db95270e
am: 7d5bc8f454

* commit '7d5bc8f4544b6b49765b87d875ced3ea7d58f430':
Fix: accessibility actions move languages but don't update

Change-Id: I0a0bdadc04321bc28a3ce702063f9b631daf647d

commit | commitdiff | tree

Jason Monk [Fri, 29 Apr 2016 17:54:33 +0000 (17:54 +0000)]

Merge "Don't crash settings when out of space." into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 29 Apr 2016 17:53:44 +0000 (17:53 +0000)]

Merge "Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am: 7dce005fab am: f02a31beaa" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Mihai Niță [Fri, 29 Apr 2016 17:53:38 +0000 (17:53 +0000)]

Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am: 7dce005fab
am: f02a31beaa

* commit 'f02a31beaab1da23537073c8f376b9daec7b2215':

Change-Id: Ia1ee12e5410a835a3c6382208dd3a79a8aa37d3d

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 29 Apr 2016 17:53:01 +0000 (17:53 +0000)]

Merge "Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am: 7dce005fab am: f02a31beaa" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Mihai Niță [Fri, 29 Apr 2016 17:52:51 +0000 (17:52 +0000)]

Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am: 7dce005fab
am: f02a31beaa

* commit 'f02a31beaab1da23537073c8f376b9daec7b2215':
Fix: accessibility actions move languages but don't update

Change-Id: Ibbbcf694cb80a9ec586bce48a5cab07c98e7c38f

commit | commitdiff | tree

Mihai Niță [Fri, 29 Apr 2016 17:52:50 +0000 (17:52 +0000)]

Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am: 7dce005fab
am: 48db95270e

* commit '48db95270ec9a85edd15b1df1085aad0020851ba':
Fix: accessibility actions move languages but don't update

Change-Id: I99157a90add1fb4bdaa513a6b479d2c7d1634fde

commit | commitdiff | tree

Jason Monk [Fri, 29 Apr 2016 17:51:08 +0000 (13:51 -0400)]

Don't crash settings when out of space.

Change-Id: I2e36fe845601558d789f38ae9f70d1a1684d8fd4
Fixes: 28198128

commit | commitdiff | tree

Mihai Nita [Fri, 29 Apr 2016 17:50:39 +0000 (17:50 +0000)]

Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev
am: 7dce005fab

* commit '7dce005fabf15c3532db0540cdc2c67e59da7fb4':
Fix: accessibility actions move languages but don't update

Change-Id: Ie565b3a9d7d7caa00d8be389774b397339fec1b9

commit | commitdiff | tree

Mihai Nita [Fri, 29 Apr 2016 17:50:39 +0000 (17:50 +0000)]

commit | commitdiff | tree

Mihai Niță [Fri, 29 Apr 2016 17:46:16 +0000 (17:46 +0000)]

Merge "Fix: accessibility actions move languages but don't update" into nyc-dev

commit | commitdiff | tree

Clara Bayarri [Fri, 29 Apr 2016 17:43:43 +0000 (17:43 +0000)]

Merge "Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0 am: 99e5285425" into nyc-mr1-dev-plus-aosp
am: 23456e3844

* commit '23456e3844e2b54c5003b777b34ed5d8806eea1b':

Change-Id: Ida6baacccfdcc11b5a9316ca8b7a20526bd88c60

commit | commitdiff | tree

Clara Bayarri [Fri, 29 Apr 2016 17:43:42 +0000 (17:43 +0000)]

Merge "Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0 am: 99e5285425" into nyc-mr1-dev-plus-aosp
am: 663353e71b

* commit '663353e71b52f0e3b8e53043a4ae2a07b0e38df5':

Change-Id: I80757e298cce057ca12584e19b49c5b4a9bcf8b7