drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
160,031 Commits 1 Branch 0 Tags
Commit Graph

160031 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Roos
0108d98369 am 26750711: Merge "Explicitly specify user for public mode" into lmp-mr1-dev 
* commit '26750711e12900aca6c7c35556b4548038cfb505':
  Explicitly specify user for public mode
 2014-11-21 18:02:26 +00:00
Adrian Roos
26750711e1 Merge "Explicitly specify user for public mode" into lmp-mr1-dev 2014-11-21 17:57:01 +00:00
Rubin Xu
55a05e4d35 am b90a2f9d: Merge "String literals for CL ag/586597" into lmp-mr1-dev 
* commit 'b90a2f9d1a58586ef8215176bae22ac6dc4eaee3':
  String literals for CL ag/586597
 2014-11-21 17:54:26 +00:00
Rubin Xu
b90a2f9d1a Merge "String literals for CL ag/586597" into lmp-mr1-dev 2014-11-21 17:50:23 +00:00
Scott Rowe
63108ee362 am 02cb1fe6: am 14f78ed7: Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs 
* commit '02cb1fe6c4a12c15ef44c2982fcab71ba6346c9b':
  docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
 2014-11-21 17:50:17 +00:00
Ruben Brunk
a345b3671a am 5d3d53aa: Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev 
* commit '5d3d53aa1361c094f05aa70129e49a04875ab5a6':
  Camera2: Doc updates for aeExposureCompensation.
 2014-11-21 17:49:34 +00:00
Ruben Brunk
5d3d53aa13 Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev 2014-11-21 17:42:44 +00:00
Scott Rowe
02cb1fe6c4 am 14f78ed7: Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs 
* commit '14f78ed7b8c374017fa37f29cfed2208a072ea28':
  docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
 2014-11-21 17:41:06 +00:00
Scott Rowe
14f78ed7b8 Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs 2014-11-21 17:34:29 +00:00
Sreeram Ramachandran
c2c0beab79 Allow VPNs to specify their underlying networks. 
These are used when responding to getActiveNetworkInfo() (and cousins)
when an app is subject to the VPN.

Bug: 17460017
Change-Id: Ief7a840c760777a41d3358aa6b8e4cdd99c29f24
 2014-11-21 09:26:18 -08:00
Selim Cinek
9c4a707912 Fixed several time related states for secondary users 
The 24 hour setting was not respected correctly. Also
fixed a bug where the next alarm would not display itself
in the QS panel.

Bug: 16239208
Change-Id: I89734f783912dead5831db49db53fba04dbf54ee
 2014-11-21 18:25:30 +01:00
Rubin Xu
7f9e014b00 String literals for CL ag/586597 
Mini-CL to get the strings in for translations.

Bug: 17657954
Change-Id: Ibbe053b886dadf0f42b3b830c44e86b0df158727
 2014-11-21 17:04:11 +00:00
Sreeram Ramachandran
75f018e6a7 Delete unused/non-working code. 
Change-Id: I2cba9ffdb4ed547cb922d0ac08abf81e49ffa66b
 2014-11-21 08:08:19 -08:00
Sreeram Ramachandran
21b5ee3f0e Eliminate race conditions in UID-based network filtering. 
The previous code retrieved information from the legacy tracker multiple
times for each user query, leading to race conditions where the info
could've changed between the calls.

Refactors the handling of legacy data types in ConnectivityService and
unifies call paths so that APIs that deal with legacy data types
(NetworkInfo and int/networkType) and newer types (such as Network) go
through common code paths, using NetworkState to hold all the necessary
data pieces. This enables follow-on bug fixes to getActiveNetworkInfo().

The changes are limited to public "query" APIs (those that retrieve some
network information or the other). More details about the specific
changes and their rationale can be found in the code review thread.

Bug: 17460017
Change-Id: I656ee7eddf2b8cace5627036452bb5748043406c
 2014-11-21 08:07:13 -08:00
Zoltan Szatmary-Ban
b3d0580f0f am 08229e81: Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev 
* commit '08229e817ecb67b0c7ebbd6b5b9ce4aef1b38cc2':
  Shutdown backup manager service when device owner is set
 2014-11-21 15:24:39 +00:00
Zoltan Szatmary-Ban
b3e8ff00c8 am 07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev 
* commit '07334334aab3863408325653ceccee47f9e1788d':
  Adding method to query backup manager service activity status
 2014-11-21 15:24:33 +00:00
Zoltan Szatmary-Ban
08229e817e Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev 2014-11-21 15:21:07 +00:00
Zoltan Szatmary-Ban
07334334aa Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev 2014-11-21 15:20:47 +00:00
Adrian Roos
7e2e40e127 Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045 
Fix log spam and wrong log string.

Bug: 18414067
Change-Id: I588ec7b62055d2374d311d3adf9edd500ca40380
 2014-11-21 15:27:12 +01:00
Adrian Roos
c5db390f5b Revert "Only keep user switcher bitmaps if needed" 
This reverts commit cba0faadbe1c8cf7c6b264b761d747f7381a2f93 
with change id I416beb82156787e61ee1f59b6726fd702f135f68.

It keeps the fix preventing us from reclipping already loaded
bitmaps.

Bug: 18350670
Change-Id: I0562d38d2a6eb0b715adcd4ca77512f2cbedd320
 2014-11-21 13:59:42 +00:00
Adrian Roos
31b844ba0c Explicitly specify user for public mode 
Bug: 18417850
Change-Id: I9d564a47fe66cb8035d73c8a2eedb912920410a2
 2014-11-21 13:55:09 +01:00
Paul Jensen
934b73fb50 am 0653f508: Merge "Don\'t allow an uncreated Network to satsify requests." into lmp-mr1-dev 
* commit '0653f508b58eab994089ae2da783852a5c1b4a8a':
  Don't allow an uncreated Network to satsify requests.
 2014-11-21 12:47:23 +00:00
Paul Jensen
0653f508b5 Merge "Don't allow an uncreated Network to satsify requests." into lmp-mr1-dev 2014-11-21 12:42:34 +00:00
Adrian Roos
f8f56bce42 Fix DPM.resetPassword("") 
While we're at it, also fix some multi-user issues in
LockPatternUtils.

Bug: 17496766
Change-Id: I8e557ea640fa589817c8f8f818c91463585d5ea7
 2014-11-21 13:34:06 +01:00
Geoffrey Borggaard
8a2ac41dcf am e548c3a3: am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev automerge: 90ed95f 
* commit 'e548c3a3786a252d42b3c0ae0823f4718fcb9718':
  Fix null handling in proxies.
 2014-11-21 10:25:37 +00:00
Ricardo Cervera
d9e6f658a5 am 462b3201: am e9b5dfc0: am 25bf00bc: docs: Fixes to the Data Layer Wear class. automerge: 8837ce2 
* commit '462b32011a0b5309e97c4c0bf6bed976d070127f':
  docs: Fixes to the Data Layer Wear class.
 2014-11-21 10:21:30 +00:00
Ricardo Cervera
d4ea7b3cb6 am 9aede602: am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev automerge: 161dce4 
* commit '9aede602ff1fa23d1f97ccb0adf0967eef947977':
  docs: Fixes to the Data Layer Wear class.
 2014-11-21 10:21:25 +00:00
Filip Gruszczynski
5ea0411f39 am a83c5806: Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev automerge: 96c5d37 
* commit 'a83c5806ded083f51549ba4bf70e0c1f6a17fc61':
  SwipeDismissLayout makes activity opaque only after entry animation ends.
 2014-11-21 10:21:19 +00:00
Geoffrey Borggaard
e548c3a378 am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev 
automerge: 90ed95f

* commit '90ed95faeddf7ebe71320e3e0e80eb17d374e49c':
  Fix null handling in proxies.
 2014-11-21 10:17:39 +00:00
Andrew Solovay
5a75a660c0 am d3e2fd99: am c79173c7: am 05282133: Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs automerge: b5b9c9b 
* commit 'd3e2fd99e23ca579d22508e40e4f58282ea7279e':
  docs: Bugfix & minor cleanup for "Providing Messaging for Auto"
 2014-11-21 10:16:55 +00:00
Elliott Hughes
889a259118 am 2d732006: am 03c80408: am 6c43e6b5: Fix and be more explicit about plurals best practices. automerge: 4db3fc1 
* commit '2d7320066fd2622241cb388201d8b584081cc19c':
  Fix and be more explicit about plurals best practices.
 2014-11-21 10:16:50 +00:00
Dirk Dougherty
1896e58904 am 40343340: am ef629f1f: am a79acc03: Doc change: localized content. automerge: 4d82f8a 
* commit '403433401bf5a86405d79b6e48ac972941425ed0':
  Doc change: localized content.
 2014-11-21 10:16:40 +00:00
Ricardo Cervera
462b32011a am e9b5dfc0: am 25bf00bc: docs: Fixes to the Data Layer Wear class. 
automerge: 8837ce2

* commit '8837ce2ce3b8e10a5201a18b77a790d0df43d8e4':
  docs: Fixes to the Data Layer Wear class.
 2014-11-21 10:16:35 +00:00
smain@google.com
39d6b21ee5 am 74bafd41: am 555d6e70: am 2411fe88: Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs automerge: 6e08d30 
* commit '74bafd41afd2291a9b28c9f2ae3baabca9f1d72d':
  add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
 2014-11-21 10:16:34 +00:00
Ricardo Cervera
9aede602ff am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev 
automerge: 161dce4

* commit '161dce465ef528568eac119235e635b217322485':
  docs: Fixes to the Data Layer Wear class.
 2014-11-21 10:15:17 +00:00
Filip Gruszczynski
a83c5806de Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev 
automerge: 96c5d37

* commit '96c5d37fb5139465cdd3d882b5deba830497557a':
  SwipeDismissLayout makes activity opaque only after entry animation ends.
 2014-11-21 10:13:59 +00:00
Andrew Solovay
d3e2fd99e2 am c79173c7: am 05282133: Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs 
automerge: b5b9c9b

* commit 'b5b9c9b589c058d9e21ca23976d7574f9c604e38':
  docs: Bugfix & minor cleanup for "Providing Messaging for Auto"
 2014-11-21 10:12:52 +00:00
Quddus Chong
ecccf10b42 am 5b944f4a: am 8428c114: am 9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc. automerge: a1e1890 
* commit '5b944f4a3e9d3fcca9cd54c08bc4a95c9cd87f80':
  docs: Added link to CarExtender class from Auto Getting Started doc.
 2014-11-21 10:11:49 +00:00
Deepanshu Gupta
58238d900b am 9ab79551: am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev automerge: ddc83df 
* commit '9ab79551ac9cee85e019d524dae6a5a6b4004cb5':
  Fix setTextAppearance for styles with dots.
 2014-11-21 10:11:44 +00:00
Deepanshu Gupta
b4a2379876 am 1150292d: am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev automerge: a0bc2e7 -s ours 
* commit '1150292dacc912316a73594788f85d678faef15d':
  LayoutLib: Stub AM/PM keycodes in Time Picker.
 2014-11-21 10:11:39 +00:00
Elliott Hughes
2d7320066f am 03c80408: am 6c43e6b5: Fix and be more explicit about plurals best practices. 
automerge: 4db3fc1

* commit '4db3fc1c28d3894aed92c5aae40f25e713a69894':
  Fix and be more explicit about plurals best practices.
 2014-11-21 10:11:34 +00:00
Dirk Dougherty
403433401b am ef629f1f: am a79acc03: Doc change: localized content. 
automerge: 4d82f8a

* commit '4d82f8ad32f9caa3aff237600c4693f8907009e9':
  Doc change: localized content.
 2014-11-21 10:10:32 +00:00
smain@google.com
74bafd41af am 555d6e70: am 2411fe88: Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs 
automerge: 6e08d30

* commit '6e08d30da4db5fc8a433b93f16ada2bcf6d1a5cd':
  add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
 2014-11-21 10:09:15 +00:00
Quddus Chong
5b944f4a3e am 8428c114: am 9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc. 
automerge: a1e1890

* commit 'a1e18907975436803bc13a65ec25f30b6606379e':
  docs: Added link to CarExtender class from Auto Getting Started doc.
 2014-11-21 10:08:07 +00:00
Deepanshu Gupta
9ab79551ac am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev 
automerge: ddc83df

* commit 'ddc83dfa8f17db1a8a566c8b92b0fea56dedd00a':
  Fix setTextAppearance for styles with dots.
 2014-11-21 10:06:59 +00:00
Deepanshu Gupta
1150292dac am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev 
automerge: a0bc2e7  -s ours

* commit 'a0bc2e7e3c2f075a23449df00659c96d0cddb417':
  LayoutLib: Stub AM/PM keycodes in Time Picker.
 2014-11-21 10:05:07 +00:00
John Spurlock
ed06df1314 am 1bd81e31: Merge "Doze: Make proximity check configurable." into lmp-mr1-dev 
* commit '1bd81e31f31a6d8dc06af79985ca820effab970c':
  Doze: Make proximity check configurable.
 2014-11-21 03:40:45 +00:00
John Spurlock
1bd81e31f3 Merge "Doze: Make proximity check configurable." into lmp-mr1-dev 2014-11-21 03:36:40 +00:00
jungheang.lee
735b75ce27 Cannot set Pivot X,Y values from setPivotX, setPivotY API 
Pivot value can not be changed once they have been set to default.
To be changed "==" -> "!=" in if()

BUG: 18474532
Change-Id: Iacd16eb951154ea97c241566b704e0ad3f225bd1
 2014-11-21 03:01:41 +00:00
John Spurlock
686e4d57d8 Doze: Make proximity check configurable. 
Default to true, but make it available for overlay or setting
at runtime.

Bug: 18373928
Change-Id: I6abc1924ea0f03620f4683dc055f64ede5782809
 2014-11-20 21:59:13 -05:00