OSDN Git Service
Felipe Leme [Sat, 7 May 2016 05:30:12 +0000 (05:30 +0000)]
Merge "Implemented onRestrictPowerChanged()." into nyc-dev
am:
f135ad5186
* commit '
f135ad5186377bb2525b644c09db92b1d9171656':
Implemented onRestrictPowerChanged().
Change-Id: I936f603cd3feade0c821d0d17814b11317106a31
Jason Monk [Sat, 7 May 2016 05:30:11 +0000 (05:30 +0000)]
Merge "Fix accessibility description on master clear" into nyc-dev
am:
c12521cdcc
* commit '
c12521cdccb14f9f1bd623902d010090ebffc5d4':
Fix accessibility description on master clear
Change-Id: I81313191558700095f6812392cc29c3b655a464a
Victor Chang [Sat, 7 May 2016 05:30:11 +0000 (05:30 +0000)]
Merge "TrustCredentials listview should be expanded by default" into nyc-dev
am:
963c3a4e9f
* commit '
963c3a4e9f06808c098fe3de4aaec5033431f21d':
TrustCredentials listview should be expanded by default
Change-Id: I4edd0c7687a8951456152f334a3a169c817f8ec1
Bill Yi [Sat, 7 May 2016 05:30:11 +0000 (05:30 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
7f1b86e5df -s ours
* commit '
7f1b86e5df66271371cd2e570b5a32c12cde7fee':
Import translations. DO NOT MERGE
Change-Id: I3ce02f9f42210188d909e48fce22a21ab53ee816
Clara Bayarri [Sat, 7 May 2016 05:30:08 +0000 (05:30 +0000)]
Merge "Remove invisible object in A11y Settings screens\' menu" into nyc-dev
am:
2540d66bfe
* commit '
2540d66bfed468615d560e93eaaa3621296db0ec':
Remove invisible object in A11y Settings screens' menu
Change-Id: Idcdc2f7d4d1afb6c2c8b5e54a8a5cb5c6a4b3240
Pavlin Radoslavov [Sat, 7 May 2016 01:57:18 +0000 (18:57 -0700)]
resolve merge conflicts of
8fa3d44 to nyc-mr1-dev
Change-Id: I1eea61da6904c5d2c181962ff5bac75454d2929d
Felipe Leme [Tue, 3 May 2016 15:43:08 +0000 (08:43 -0700)]
Implemented onRestrictPowerChanged().
BUG:
28521946
Change-Id: I702e27401f74eee6ce884351ae4e0bc89ec6b8e2
(cherry picked from commit
f79c20500e4e14992f8f470836bf61a6c9d4a1d3)
TreeHugger Robot [Fri, 6 May 2016 23:25:27 +0000 (23:25 +0000)]
Merge "Implemented onRestrictPowerChanged()." into nyc-dev
Jason Monk [Fri, 6 May 2016 18:33:07 +0000 (18:33 +0000)]
Merge "Fix accessibility description on master clear" into nyc-dev
Jason Monk [Fri, 6 May 2016 18:28:09 +0000 (14:28 -0400)]
Fix accessibility description on master clear
Only include visible views
Change-Id: I271ae87c788e270b15e7ca8758059771cde16d33
Fixes:
28316423
Fan Zhang [Fri, 6 May 2016 15:45:30 +0000 (15:45 +0000)]
Merge "Update support email/chat display string." into nyc-mr1-dev
Robin Lee [Fri, 6 May 2016 15:27:41 +0000 (15:27 +0000)]
Merge "TrustCredentials listview should be expanded by default" into nyc-dev
TreeHugger Robot [Fri, 6 May 2016 14:14:48 +0000 (14:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Clara Bayarri [Fri, 6 May 2016 13:36:11 +0000 (13:36 +0000)]
Merge "Remove invisible object in A11y Settings screens' menu" into nyc-dev
Victor Chang [Thu, 14 Apr 2016 21:51:38 +0000 (22:51 +0100)]
TrustCredentials listview should be expanded by default
UI Change for 2-profile case:
1. When both personal and work listview are expanded, half height is allocated for each list view
2. When only one listview is expanded, full height is allocated to the list view
Video can be found at go/trust-cred-split-view
- Use 2 ListView instead of 1 ExpandableListView in order to scoll the list independently
- The ui is not changed for only one or more than 3 profiles.
- Remove TrustedCertificateAdapterCommons, and wrap GroupAdapter by ChildAdapter in order to re-use more codes
- clear mAliasLoaders in onDestroy. (Seems it's a bug.)
- When work mode or fbe locked, force to collapse work list view. User message will be prompted when user press on header
- Groups in GroupAdapter is set synchronously instead of async, since we assume the number of users are fixed during initialization
- DataSet events will go through GroupAdapter to notifiy ChildAdapter
Bug:
28236955
(cherry picked from commit
7dde845544bd74734ac6c444c77d7be7b187873a)
Change-Id: I87293afc56e9cc270c2289111bab6f1809351faf
Clara Bayarri [Fri, 6 May 2016 11:16:49 +0000 (12:16 +0100)]
Remove invisible object in A11y Settings screens' menu
Bug:
28459491
Change-Id: I95250078bf6470d0bd4b6b40f25c13eb6aec93c8
Bill Yi [Fri, 6 May 2016 04:41:59 +0000 (21:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idd3405760f34528ea4561057609d438bd0871a0b
Auto-generated-cl: translation import
Bill Yi [Fri, 6 May 2016 04:35:29 +0000 (21:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iff19a526307de6bd652ba382c1914098f13583e0
Auto-generated-cl: translation import
Fan Zhang [Thu, 5 May 2016 20:45:51 +0000 (13:45 -0700)]
Update support email/chat display string.
Bug:
28141203
Also removed unnecessary padding restriction in layout so button width
can grow.
Change-Id: I2805cf161407b16544bd2dcb89d56ba8f11669b9
Maurice Lam [Thu, 5 May 2016 20:19:54 +0000 (20:19 +0000)]
Merge "Don't draw divider under headers" into nyc-mr1-dev
pkanwar [Sat, 30 Apr 2016 00:43:24 +0000 (17:43 -0700)]
The "device type" icons in "Bluetooth device list" screen are
not accessible to TalkBack users.
b/
28199679 Changed method to for setting the talk-back
attribute on "device type".
Change-Id: I63820d861ea1075195b98c82004ba95470448a53
Fan Zhang [Tue, 3 May 2016 00:25:05 +0000 (17:25 -0700)]
Add estimate time under support options.
Bug:
28141203
- SupportFeatureProvider will provide a localized estimate string.
- Use a builder pattern to instantiate SupportData to avoid increasing
constructor args.
Change-Id: I92e90cd57b4ef4e1d921f403801cfd5984ef6a3b
Rachel Zhang [Thu, 5 May 2016 17:58:13 +0000 (17:58 +0000)]
Merge "Launch Help & Feedback" into nyc-mr1-dev
Abodunrinwa Toki [Thu, 5 May 2016 16:46:48 +0000 (16:46 +0000)]
Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev
am:
56f7bc44a1
* commit '
56f7bc44a1d6474e1ce6b9631cdd8087f1577490':
InputSettings: Define order of items in Physical keyboards screen.
Change-Id: If981f9c6d29aaaaf9c1667e930a10fc1f1c82419
Abodunrinwa Toki [Thu, 5 May 2016 16:40:57 +0000 (16:40 +0000)]
Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev
Jason Monk [Thu, 5 May 2016 15:47:50 +0000 (15:47 +0000)]
Merge "Don\'t crash on non-app data usage" into nyc-dev
am:
d1a4e452ed
* commit '
d1a4e452ed659f4f52b0b72f54da1100c6b1f512':
Don't crash on non-app data usage
Change-Id: Ia43d98b016a2786dc5ad22e8f2a013b09bcff83d
Jason Monk [Thu, 5 May 2016 15:47:50 +0000 (15:47 +0000)]
Merge "Fix cell data limit dialog title" into nyc-dev
am:
2a6bc40d49
* commit '
2a6bc40d497d1bc0fdfc9cc86bc4db72791909b7':
Fix cell data limit dialog title
Change-Id: Ief4e72d16cb49592c08e284ec14af383125f7ae8
Jason Monk [Thu, 5 May 2016 15:41:17 +0000 (15:41 +0000)]
Merge "Don't crash on non-app data usage" into nyc-dev
Jason Monk [Thu, 5 May 2016 15:40:50 +0000 (15:40 +0000)]
Merge "Fix cell data limit dialog title" into nyc-dev
Tony Mak [Thu, 5 May 2016 13:57:03 +0000 (13:57 +0000)]
Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev
am:
de4b51c8ce
* commit '
de4b51c8ce4d16ef086ad04532113a942b267f1a':
Should forward the intent even if its activity is disabled in Settings
Change-Id: I3f2c1ce85fc96f299b931a99036f72e1e2478bd8
Tony Mak [Thu, 5 May 2016 13:50:09 +0000 (13:50 +0000)]
Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev
Abodunrinwa Toki [Fri, 22 Apr 2016 16:45:03 +0000 (17:45 +0100)]
InputSettings: Define order of items in Physical keyboards screen.
Bug:
28158120
Change-Id: Ia7cec64edb9da53a2048865e317b2b9d4b2059b0
Maurice Lam [Wed, 4 May 2016 22:24:58 +0000 (15:24 -0700)]
Don't draw divider under headers
Create SettingsDividerItemDecoration which reads PreferenceViewHolder
isDividerAllowedAbove/Below so that will be taken into account as
well as other ViewHolders which implements DividedViewHolder.
Bug:
28445348
Change-Id: I73e298f2ca1688b135e533a8d3ef5f5c154963f7
Hyunyoung Song [Wed, 4 May 2016 20:43:08 +0000 (20:43 +0000)]
Merge "Add shortcut manager support to Settings (2/2) b/
28298258" into nyc-mr1-dev
Jason Monk [Wed, 4 May 2016 19:46:05 +0000 (15:46 -0400)]
Fix cell data limit dialog title
Change-Id: I0303bc74bb7b0e46ed020d255baf2465c7db0fc5
Fixes:
27604216
Philip P. Moltmann [Wed, 4 May 2016 19:19:06 +0000 (19:19 +0000)]
Merge "Do not set order for print services settings." into nyc-dev
am:
de4e43edda
* commit '
de4e43eddae70b63671083fd6fc95de7df1ed2fd':
Do not set order for print services settings.
Change-Id: Icb3b9ca85af76635eb64a60a45cd91fc13ab7bb1
Philip P. Moltmann [Wed, 4 May 2016 19:08:48 +0000 (19:08 +0000)]
Merge "Do not set order for print services settings." into nyc-dev
Robin Lee [Wed, 4 May 2016 18:54:52 +0000 (18:54 +0000)]
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev
am:
662731fb55
* commit '
662731fb55971cb81d52dd611075c7a5df5eb023':
Add lockdownEnabled parameter to always-on VPN API
Change-Id: I0730abfe3c7cbec60f3961f5c9d8e111c2e8a5ac
Hyunyoung Song [Wed, 4 May 2016 17:49:59 +0000 (10:49 -0700)]
Add shortcut manager support to Settings (2/2)
b/
28298258
Locale change will be handled in future CL/ dynamic shortcut list
change using a UI will be handled in follow up CL.
Change-Id: I5468b17e8c8b32625139ab0484d5d0386be0961d
Robin Lee [Wed, 4 May 2016 18:38:28 +0000 (18:38 +0000)]
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev
Fan Zhang [Wed, 4 May 2016 17:47:17 +0000 (17:47 +0000)]
Merge "Bring escalation options UI closer to mock." into nyc-mr1-dev
Jason Monk [Wed, 4 May 2016 17:43:26 +0000 (13:43 -0400)]
Don't crash on non-app data usage
Change-Id: Ib39fc280a892dea2e3e7cbe22339799ab51a6eca
Fixes:
28531037
Jeff Sharkey [Wed, 4 May 2016 17:34:56 +0000 (17:34 +0000)]
Merge "UX polish tweaks to FallbackHome." into nyc-dev
am:
e50853f485
* commit '
e50853f485fd99c14d6af8167b06fc0c5ae19a22':
UX polish tweaks to FallbackHome.
Change-Id: I392867952c277fea71ab86389ed6df1e5e483b20
TreeHugger Robot [Wed, 4 May 2016 17:13:16 +0000 (17:13 +0000)]
Merge "UX polish tweaks to FallbackHome." into nyc-dev
Philip P. Moltmann [Wed, 4 May 2016 16:44:01 +0000 (09:44 -0700)]
Do not set order for print services settings.
What happened before was that negative number turned out to be order
behind ORDER_LAST.
Change-Id: I714f623a2b1be06dde86ae7f36b39c64006203f2
Daniel Nishi [Wed, 4 May 2016 16:13:24 +0000 (16:13 +0000)]
Merge "Fix a bug where negative file sizes were being used." into nyc-mr1-dev
Fan Zhang [Thu, 28 Apr 2016 22:20:09 +0000 (15:20 -0700)]
Bring escalation options UI closer to mock.
Bug:
28141203
Change-Id: Ia6d50d7d6f3010695c62fc1e8bd07f858715e455
Mahaver Chopra [Wed, 4 May 2016 14:22:27 +0000 (14:22 +0000)]
Merge "More informative title while choosing work lock." into nyc-dev
am:
9efcb2e314
* commit '
9efcb2e314f4c31de26cea629b03b436f7b84df1':
More informative title while choosing work lock.
Change-Id: Ib71598d4112cb10392fa32cc39aa10699ad6855e
Mahaver Chopra [Wed, 4 May 2016 14:03:08 +0000 (14:03 +0000)]
Merge "More informative title while choosing work lock." into nyc-dev
Nicolas Prevot [Wed, 4 May 2016 12:53:36 +0000 (12:53 +0000)]
Merge "Only ask for credentials in add account if user is locked." into nyc-dev
am:
832c8e4fda
* commit '
832c8e4fdadce8b8fd9b13fe584a7dfb0324d0a0':
Only ask for credentials in add account if user is locked.
Change-Id: Ic93962179b1ce9ac19233810dbf065aedd662168
Tony Mak [Wed, 4 May 2016 12:51:41 +0000 (13:51 +0100)]
Should forward the intent even if its activity is disabled in Settings
This fixes the cross profile intent filter test in CtsVerifier.
Activities of action APPLICATION_DEVELOPMENT_SETTINGS and
NFC_PAYMENT_SETTINGS are disabled in managed profile. But we still
want their corresponding intents to be forwarded to personal side.
Bug:
28426865
Change-Id: I65afc06f7faf4532d9e132f44c1faa49f47d1a2e
Nicolas Prévot [Wed, 4 May 2016 12:43:31 +0000 (12:43 +0000)]
Merge "Only ask for credentials in add account if user is locked." into nyc-dev
Mahaver Chopra [Wed, 4 May 2016 12:11:17 +0000 (13:11 +0100)]
More informative title while choosing work lock.
When Intent ACTION_SET_NEW_PASSWORD is called from a managed profile,
ChooseLockGeneric fragment shows title "Unlock Selection", update that to
"Choose work lock".
Bug:
28451356
Change-Id: I9bcf4698557fa453337aa666f10f94f15e7624fa
Nicolas Prevot [Thu, 21 Apr 2016 11:26:48 +0000 (12:26 +0100)]
Only ask for credentials in add account if user is locked.
Also: if work mode is off, ask to turn work on before adding
a work account.
BUG:
28220470
Change-Id: Ib23f87f056ad41c1f9713bb8d3c5263f015e6475
Tony Mak [Wed, 4 May 2016 10:14:48 +0000 (11:14 +0100)]
resolve merge conflicts of
d5b3a5d to nyc-mr1-dev
Change-Id: I1eb01bfdad24935efbbdbeaee0dcf1c374a2cadb
Tony Mak [Wed, 4 May 2016 09:33:24 +0000 (09:33 +0000)]
Merge "Add managed profile setting page" into nyc-dev
Baligh Uddin [Wed, 4 May 2016 00:23:48 +0000 (00:23 +0000)]
Import translations. DO NOT MERGE
am:
61e99fed5b -s ours
* commit '
61e99fed5bf1791f0cc73199f8d99d9519a9f811':
Import translations. DO NOT MERGE
Change-Id: I6f32a88ec655e494347168c37cb0ecba7ebea8ba
Daniel Nishi [Wed, 4 May 2016 00:21:51 +0000 (17:21 -0700)]
Fix a bug where negative file sizes were being used.
Negative file sizes for packages occurs when the file size is either
unknown or if an error occurred during size calculation. As a result,
we can skip them for total freeable space calculations.
Bug:
28465884
Change-Id: I340d725a66a228fd94993781c5e8ef732a60a7b3
Baligh Uddin [Wed, 4 May 2016 00:00:33 +0000 (17:00 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28463229
Change-Id: I7f6bb467fe967635f9febafb61764b596d075fa3
Jeff Sharkey [Tue, 3 May 2016 23:25:37 +0000 (17:25 -0600)]
UX polish tweaks to FallbackHome.
When showing during first boot (before provisioned), render as
completely black to avoid wallpaper jank before showing SUW. Also
tweak theme used during normal (provisioned) launches to avoid
rendering the dim layer behind status bar.
Bug:
28530777
Change-Id: I4b9e6c54583f07c78d86fbe9bda7f24b6959f4ba
TreeHugger Robot [Tue, 3 May 2016 19:43:29 +0000 (19:43 +0000)]
Merge "Null check intent before starting "learn more"." into nyc-mr1-dev
Jason Monk [Tue, 3 May 2016 19:39:59 +0000 (19:39 +0000)]
Merge "Fix leaks" into nyc-dev
am:
ea8ee68507
* commit '
ea8ee685077c4fff18f6ac8e12b69d1d119a022d':
Fix leaks
Change-Id: I5fffa584a7e265533c17b341636421ee99d4812c
Jason Monk [Tue, 3 May 2016 19:36:34 +0000 (19:36 +0000)]
Merge "Fix leaks" into nyc-dev
Jason Monk [Tue, 3 May 2016 19:24:05 +0000 (15:24 -0400)]
Fix leaks
Change-Id: Iba29be756934d9564cfdee1f6281c56345772dc7
Fixes:
28074995
Jason Monk [Tue, 3 May 2016 18:42:10 +0000 (18:42 +0000)]
Merge "Try to fix receiver crash" into nyc-dev
am:
5a2d6800b6
* commit '
5a2d6800b67fdfa3ef3ba930c09668e1f59f8cfc':
Try to fix receiver crash
Change-Id: I3c2bb9113fbd9599450a011836881e91dbfd8270
Jason Monk [Tue, 3 May 2016 18:37:23 +0000 (18:37 +0000)]
Merge "Try to fix receiver crash" into nyc-dev
Michael Wright [Tue, 3 May 2016 18:34:17 +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: I4cfe66c6352b72e7b9baf933d9835df2a8c84282
Michael Wright [Tue, 3 May 2016 18:28:59 +0000 (18:28 +0000)]
Merge "Add subtext for default keyboard layout." into nyc-dev
Michael Wright [Tue, 3 May 2016 13:32:32 +0000 (14:32 +0100)]
Add subtext for default keyboard layout.
Bug:
27742933
Change-Id: I51bec339c0cbcfb114f85758b6a227deb57a69e2
Jason Monk [Tue, 3 May 2016 18:25:56 +0000 (14:25 -0400)]
Try to fix receiver crash
Change-Id: I98fcde7f4595d0bf90bf2a2b8ba96cb96519a008
Fixes:
28554650
Andrew Sapperstein [Tue, 3 May 2016 01:28:21 +0000 (18:28 -0700)]
Null check intent before starting "learn more".
It is possible in certain build configurations to have an invalid
link. Instead of crashing, swallow the error and write to logs.
BUG:
28381984
Change-Id: I19f20b96afb42758187707f1b86a5817e8d737a8
Tony Mak [Tue, 3 May 2016 17:55:41 +0000 (18:55 +0100)]
Add managed profile setting page
Bug:
28281560
Change-Id: I1187f834dd9d002ec898a7d343198025963d1c26
Rachel Zhang [Fri, 29 Apr 2016 23:17:23 +0000 (16:17 -0700)]
Launch Help & Feedback
Bug:
28139684
Bug:
28141203
Change-Id: I9853fa5fd789cd6404dddfd9b00b7dc3afe73d91
Baligh Uddin [Tue, 3 May 2016 16:49:04 +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: I54dbc26d0afdd735fb798eefd4eab6d3a3773aa1
Baligh Uddin [Tue, 3 May 2016 16:41:20 +0000 (16:41 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Baligh Uddin [Tue, 3 May 2016 16:41:17 +0000 (16:41 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Felipe Leme [Tue, 3 May 2016 15:43:08 +0000 (08:43 -0700)]
Implemented onRestrictPowerChanged().
BUG:
28521946
Change-Id: I702e27401f74eee6ce884351ae4e0bc89ec6b8e2
Robin Lee [Tue, 3 May 2016 12:27:05 +0000 (13:27 +0100)]
Add lockdownEnabled parameter to always-on VPN API
Allows callers to opt-out of blockading network traffic during boot and
on VPN app failure.
Bug:
26694104
Change-Id: Ic2c25b79d8a17917025eb37be7de929fe156e2a3
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
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
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
Philip P. Moltmann [Mon, 2 May 2016 23:00:30 +0000 (23:00 +0000)]
Merge "Read disk ID from intent" into nyc-dev
Sudheer Shanka [Mon, 2 May 2016 20:09:58 +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: I078516706896910eeee3e86b525e96cdf807aa1b
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
Maurice Lam [Mon, 2 May 2016 18:05:23 +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: Ice07c970200be51a0b8447a1cfcaf59eac4e8142
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
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
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
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
Adrian Roos [Mon, 2 May 2016 15:13:40 +0000 (15:13 +0000)]
Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev
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
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
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
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
Jason Monk [Fri, 29 Apr 2016 18:54:08 +0000 (18:54 +0000)]
Merge "Don't crash on Settings data usage" into nyc-dev
Fan Zhang [Fri, 29 Apr 2016 18:20:50 +0000 (18:20 +0000)]
Merge "Disable stable id in support adapter." into nyc-mr1-dev
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
Jason Monk [Fri, 29 Apr 2016 17:57:24 +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: Ie1095da87343cc74d65bbcf255d5692197a7a241
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
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