PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,101 Commits 1 Branch 0 Tags
262148ecbd004c07556e13e143c66b51b679b332
Commit Graph

28101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip P. Moltmann
6a2c269a4c Merge "Read disk ID from intent" into nyc-dev am: e0e7fa4501 
am: 0c71d3b5cf

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

Change-Id: I3854c5c6f17789e5bdfa16b5c4c7ff9ca635b4d1
 2016-05-02 23:29:43 +00:00
Philip P. Moltmann
0c71d3b5cf Merge "Read disk ID from intent" into nyc-dev 
am: e0e7fa4501

* commit 'e0e7fa4501214be7c2cdf0fbf3e503d54504bd3f':
  Read disk ID from intent

Change-Id: Ia40f3b5901385cf22ddadc37131f464dbee93b2b
 2016-05-02 23:24:05 +00:00
Philip P. Moltmann
fe99c4282e Merge "Read disk ID from intent" into nyc-dev 
am: e0e7fa4501

* commit 'e0e7fa4501214be7c2cdf0fbf3e503d54504bd3f':
  Read disk ID from intent

Change-Id: Ifd8786add5110d6556a0974d1e0379e68490acb4
 2016-05-02 23:24:05 +00:00
Philip P. Moltmann
e0e7fa4501 Merge "Read disk ID from intent" into nyc-dev 2016-05-02 23:00:30 +00:00
Sudheer Shanka
1eaaee41af 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
 2016-05-02 20:34:00 +00:00
Sudheer Shanka
4fe4ff0efb 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
 2016-05-02 20:23:09 +00:00
Sudheer Shanka
7f5cc819b7 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
 2016-05-02 20:22:59 +00:00
Sudheer Shanka
1d7972ebaa 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
 2016-05-02 20:17:21 +00:00
Sudheer Shanka
0814dfbccb 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
 2016-05-02 20:09:59 +00:00
Sudheer Shanka
000293cbb9 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: I078516706896910eeee3e86b525e96cdf807aa1b
 2016-05-02 20:09:58 +00:00
Sudheer Shanka
57e6a9144a Merge "Show app installer info even if it doesn't handle ACTION.APP_SHOW_INFO." into nyc-dev 2016-05-02 20:00:45 +00:00
Maurice Lam
87b9c14176 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
 2016-05-02 18:14:58 +00:00
Maurice Lam
2d33647a8a 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
 2016-05-02 18:14:57 +00:00
Android Build Merger (Role)
e03e92503d Merge "Merge "Remove top padding only if illustration is present" into nyc-dev am: 0e4816efb9 am: ec3fec5f94" into nyc-mr1-dev-plus-aosp 2016-05-02 18:10:37 +00:00
Maurice Lam
6319330d73 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
 2016-05-02 18:10:21 +00:00
Maurice Lam
114ce05d7f 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
 2016-05-02 18:10:09 +00:00
Maurice Lam
0f27a312b7 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
 2016-05-02 18:05:27 +00:00
Maurice Lam
ec3fec5f94 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: Ice07c970200be51a0b8447a1cfcaf59eac4e8142
 2016-05-02 18:05:23 +00:00
Maurice Lam
0e4816efb9 Merge "Remove top padding only if illustration is present" into nyc-dev 2016-05-02 17:58:10 +00:00
Fan Zhang
c217ec8ef7 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
 2016-05-02 17:09:39 +00:00
Fan Zhang
e0fc6404a3 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
 2016-05-02 17:05:46 +00:00
Fan Zhang
ac74071630 Merge "Explicitly setAccount in the same way as setHasInternet." into nyc-mr1-dev 2016-05-02 16:57:12 +00:00
Fan Zhang
9502163f92 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
 2016-05-02 09:24:59 -07:00
Adrian Roos
65731da3da 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
 2016-05-02 15:29:23 +00:00
Adrian Roos
0006559b69 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
 2016-05-02 15:29:22 +00:00
Adrian Roos
0f07c96c61 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
 2016-05-02 15:29:21 +00:00
Android Build Merger (Role)
85a16e6ca9 Merge "Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am: 820d7c85c7 am: c14a9af008" into nyc-mr1-dev-plus-aosp 2016-05-02 15:26:11 +00:00
Adrian Roos
a06e1991ac Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am: 820d7c85c7 
am: c14a9af008

* commit 'c14a9af0082efdab768a46d0de82cfdbbeb97d3c':

Change-Id: I40a3e59abcc38e11102e93b2e4c40daca0d23eda
 2016-05-02 15:26:03 +00:00
Android Build Merger (Role)
d0b92c27f6 Merge "Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am: 820d7c85c7 am: c14a9af008" into nyc-mr1-dev-plus-aosp 2016-05-02 15:25:23 +00:00
Adrian Roos
04ec73db5d Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am: 820d7c85c7 
am: c14a9af008

* commit 'c14a9af0082efdab768a46d0de82cfdbbeb97d3c':
  Properly handle rotation in NotificationLockscreenPreference

Change-Id: I449720787279e53eca1e8a413519ba8fa71202ed
 2016-05-02 15:25:13 +00:00
Adrian Roos
e7b9a582e7 Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am: 820d7c85c7 
am: 3b8cc35b4a

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

Change-Id: I777028cb4d4b7120c538edc35928f1508743308f
 2016-05-02 15:25:12 +00:00
Adrian Roos
c14a9af008 Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev 
am: 820d7c85c7

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

Change-Id: I67be3fb9333356f0e1e7fa3de7c4a3838554b32a
 2016-05-02 15:21:02 +00:00
Adrian Roos
3b8cc35b4a Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev 
am: 820d7c85c7

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

Change-Id: I1ce852a59674583c5dd2e67eeb79a4419ec15cda
 2016-05-02 15:21:02 +00:00
Adrian Roos
820d7c85c7 Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev 2016-05-02 15:13:40 +00:00
Philip P. Moltmann
2fc2eb49a9 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
 2016-04-29 16:35:28 -07:00
Maurice Lam
4d227268c6 Remove top padding only if illustration is present 
Bug: 28469515
Change-Id: Ifc41b09b2b1675b696291753ff68fe4a801c76c2
 2016-04-29 15:07:40 -07:00
Adrian Roos
4bd42073d4 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
 2016-04-29 14:37:16 -07:00
Jason Monk
49e43a2503 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
 2016-04-29 19:03:16 +00:00
Jason Monk
334de02262 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
 2016-04-29 19:03:15 +00:00
Android Build Merger (Role)
b5cbaa27f7 Merge "Merge "Don\'t crash on Settings data usage" into nyc-dev am: b60c7560af am: fc63188c2c" into nyc-mr1-dev-plus-aosp 2016-04-29 19:01:10 +00:00
Jason Monk
561ec05025 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
 2016-04-29 19:01:01 +00:00
Jason Monk
e8b198b606 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
 2016-04-29 19:01:00 +00:00
Jason Monk
fc63188c2c 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
 2016-04-29 18:58:41 +00:00
Jason Monk
4b32f9f5ad Merge "Don\'t crash on Settings data usage" into nyc-dev 
am: b60c7560af

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

Change-Id: I0659dc194c2fb16dda9771e9a5a7b1d3375887b4
 2016-04-29 18:58:41 +00:00
Jason Monk
b60c7560af Merge "Don't crash on Settings data usage" into nyc-dev 2016-04-29 18:54:08 +00:00
Fan Zhang
dc5088bb9d 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
 2016-04-29 18:31:46 +00:00
Fan Zhang
bbe5bbb453 Merge "Disable stable id in support adapter." into nyc-mr1-dev 
am: 7efc40797a

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

Change-Id: Ic7cb02dd709876b88e602aa0b37aaa5e8e0898e8
 2016-04-29 18:29:30 +00:00
Fan Zhang
7efc40797a Merge "Disable stable id in support adapter." into nyc-mr1-dev 2016-04-29 18:20:51 +00:00
Jason Monk
bc4e200a59 Don't crash on Settings data usage 
Consider Settings uid (SYSTEM_UID) to be an app.

Change-Id: Ia5cc7897eafdf3d654e8a23715bd25502097bab8
Fixes: 28193076
 2016-04-29 14:06:10 -04:00
Jason Monk
33e5faf426 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
 2016-04-29 18:02:15 +00:00