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

133824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
dc4d3c37fd am a2e10038: Merge "Never close Keyguard automatically." 
* commit 'a2e10038fce80323c86ac90dff8d5d7216cde00f':
  Never close Keyguard automatically.
 2014-05-06 20:06:21 +00:00
Jorim Jaggi
ef3b18b101 Merge "Never close Keyguard automatically." 2014-05-06 20:01:43 +00:00
Tim Kilbourn
a4853f6d73 am 3439728c: Fix bad merge. 
* commit '3439728cebd6fad754ffcf33ea6d640e6ddc6f87':
  Fix bad merge.
 2014-05-06 18:00:35 +00:00
Tim Kilbourn
a2d106d470 Fix bad merge. 
Change-Id: I4d3aa71f5a4ae13c01e57df25ae7f76d25384f5d
 2014-05-06 10:54:00 -07:00
Tim Kilbourn
d5090dacfc am 6824d13d: am f7330ac7: am 989dab11: Update current.txt after hiding isGame. 
* commit '6824d13da8ce6c128427f77b4776c991ae51d702':
  Update current.txt after hiding isGame.
 2014-05-06 17:49:43 +00:00
Tim Kilbourn
e650e050e1 am 47d13bab: am a7b267b8: (-s ours) am 0f3a98f5: DO NOT MERGE Hide isGame manifest attribute. 
* commit '47d13bab53c4a35dc8bb51edbdb06c0c12d4f77a':
  DO NOT MERGE Hide isGame manifest attribute.
 2014-05-06 17:49:38 +00:00
Tim Kilbourn
d06b29d0f7 am f7330ac7: am 989dab11: Update current.txt after hiding isGame. 
* commit 'f7330ac754d02089dedef5d7191bde9a75b91c2c':
  Update current.txt after hiding isGame.
 2014-05-06 17:46:02 +00:00
Tim Kilbourn
23b0d53541 am a7b267b8: (-s ours) am 0f3a98f5: DO NOT MERGE Hide isGame manifest attribute. 
* commit 'a7b267b81b611058ddf7c268f5d21705f5306047':
  DO NOT MERGE Hide isGame manifest attribute.
 2014-05-06 17:45:58 +00:00
Tim Kilbourn
f7330ac754 am 989dab11: Update current.txt after hiding isGame. 
* commit '989dab11d1e34d5f49ac19345a3ce440d32d6f64':
  Update current.txt after hiding isGame.
 2014-05-06 17:42:36 +00:00
Tim Kilbourn
a7b267b81b am 0f3a98f5: DO NOT MERGE Hide isGame manifest attribute. 
* commit '0f3a98f5c93581cc511684b92e11e2ed2a17581e':
  DO NOT MERGE Hide isGame manifest attribute.
 2014-05-06 17:42:31 +00:00
Tim Kilbourn
989dab11d1 Update current.txt after hiding isGame. 
Change-Id: I034126f464fdd759c19ff55000004d36463d9cd6
 2014-05-06 10:40:24 -07:00
ztenghui
4db5f31d5f am c822b63a: Merge "First step on API cleaning on the VectorDrawable to disable animation support" 
* commit 'c822b63a0b16358a948d21d8ba266b60b8958502':
  First step on API cleaning on the VectorDrawable to disable animation support
 2014-05-06 17:16:56 +00:00
ztenghui
0b3a706188 Merge "First step on API cleaning on the VectorDrawable to disable animation support" 2014-05-06 17:12:34 +00:00
Tim Kilbourn
0f3a98f5c9 DO NOT MERGE Hide isGame manifest attribute. 
Bug: 14116162
Change-Id: I72a0210124f22009914a860097e286c5ea9af345
 2014-05-06 09:49:56 -07:00
John Reck
d0bee5381f am f59e3f36: Merge "Implement loadSystemProperties" 
* commit 'f59e3f36dabcf395ea891d17d793f7088a3529e9':
  Implement loadSystemProperties
 2014-05-06 16:19:32 +00:00
John Reck
ebb9e69513 Merge "Implement loadSystemProperties" 2014-05-06 16:17:13 +00:00
Baligh Uddin
e156cac4b1 am 99bb7f99: (-s ours) am ddaacaa7: (-s ours) am 37c954c0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '99bb7f99b587059a16ac815b7cdebdb9bd336476':
  Import translations. DO NOT MERGE
 2014-05-06 15:05:48 +00:00
Baligh Uddin
594b9dcc1a am ddaacaa7: (-s ours) am 37c954c0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'ddaacaa7ceb6d41658eeea0079c9882510697dac':
  Import translations. DO NOT MERGE
 2014-05-06 14:59:03 +00:00
Baligh Uddin
ddaacaa7ce am 37c954c0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '37c954c044b28b708528c074e7172a1bd91521eb':
  Import translations. DO NOT MERGE
 2014-05-06 14:54:27 +00:00
Baligh Uddin
97781b6d71 am 1dc6bb6b: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '1dc6bb6bee629784b98f7e971da815af8b9ee2c5':
  Import translations. DO NOT MERGE
 2014-05-06 14:53:37 +00:00
Baligh Uddin
37c954c044 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-05-06 14:49:57 +00:00
Baligh Uddin
dccbb6706b Merge "Import translations. DO NOT MERGE" 2014-05-06 14:49:53 +00:00
Nicolas Prevot
a9d1ed8a14 am 168ed3dc: Merge "Cleaning code related to the forwarding intent filters." 
* commit '168ed3dc2e36346d227008748fc4c69a0f03d8a5':
  Cleaning code related to the forwarding intent filters.
 2014-05-06 14:03:01 +00:00
Nicolas Prevot
45c149ae4e am 1ba4477c: Merge "Introducing removable and non-removable ForwardingIntentFilters." 
* commit '1ba4477c1f029cb9803b33476fee25b162b5a579':
  Introducing removable and non-removable ForwardingIntentFilters.
 2014-05-06 13:58:53 +00:00
Nicolas Prevot
ae949571f0 Merge "Cleaning code related to the forwarding intent filters." 2014-05-06 13:57:56 +00:00
Nicolas Prevot
834bb1cc37 Merge "Introducing removable and non-removable ForwardingIntentFilters." 2014-05-06 13:55:59 +00:00
Jorim Jaggi
0ac335d258 am 36790eb2: Merge "Fix overly huge PanelView." 
* commit '36790eb2707b73d9043d973083863295b5b4c7be':
  Fix overly huge PanelView.
 2014-05-06 13:28:13 +00:00
Jorim Jaggi
fd4235f268 Merge "Fix overly huge PanelView." 2014-05-06 13:24:20 +00:00
Nicolas Prevot
c79586ede6 Cleaning code related to the forwarding intent filters. 
Checking for INTERACT_ACROSS_USERS_FULL
Adding equivalent methods in the PackageManager

Change-Id: Iaa1328fa666613a78e67ca669ea045144275e895
 2014-05-06 13:54:48 +01:00
Jorim Jaggi
3b23999954 Fix overly huge PanelView. 
Bug: 14489968
Change-Id: Ibdc820348eb7d045ffb5ad07093ac86e5ff7abb0
 2014-05-06 14:53:04 +02:00
Jorim Jaggi
3989bf68fd am 6ea37298: Merge "Implement phone affordance on lockscreen." 
* commit '6ea372988f0732183590c021c65d392bf419dafd':
  Implement phone affordance on lockscreen.
 2014-05-06 12:12:35 +00:00
Jorim Jaggi
dba6ca00c3 Merge "Implement phone affordance on lockscreen." 2014-05-06 12:10:53 +00:00
Jorim Jaggi
97b63c4112 Implement phone affordance on lockscreen. 
Refactor the camera affordance into a reusable view. This change
also swaps the asset for the camera affordance.

Bug: 14488709
Change-Id: I0633614f6a1ea81faa37923f748af3c635e64a52
 2014-05-06 13:56:44 +02:00
Nicolas Prevot
6fee7d4cf9 Introducing removable and non-removable ForwardingIntentFilters. 
clearForwardingIntentFilters removes only non-removable IntentFilters.
The ForwardingIntentFilters set by the profile owner are always removable.

Change-Id: If950ccd7e69261b86360ea647fdb501c92f5440b
 2014-05-06 12:37:20 +01:00
Jesse Hall
dcf2d73238 am cb508743: Merge "VirtualDisplayAdapter: Set the transaction surface even if NULL" 
* commit 'cb508743939829d71935ba05f630f52efba64eca':
  VirtualDisplayAdapter: Set the transaction surface even if NULL
 2014-05-06 04:03:14 +00:00
Jesse Hall
da25a59a19 Merge "VirtualDisplayAdapter: Set the transaction surface even if NULL" 2014-05-06 04:00:39 +00:00
Elliott Hughes
ee06dee7b5 am fcfa49c2: am 86768034: am b593ad60: am f1f28d1d: Merge "Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice." 
* commit 'fcfa49c2e900d647bc9d1ba307737db37dd46ef7':
  Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice.
 2014-05-06 02:38:19 +00:00
Elliott Hughes
f3e7945c79 am 86768034: am b593ad60: am f1f28d1d: Merge "Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice." 
* commit '867680342e12af59a26756f30cf817a131724943':
  Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice.
 2014-05-06 02:34:40 +00:00
Elliott Hughes
867680342e am b593ad60: am f1f28d1d: Merge "Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice." 
* commit 'b593ad60682a6f8c945c4c2ffc3d278df3f6e360':
  Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice.
 2014-05-06 02:31:03 +00:00
Elliott Hughes
b593ad6068 am f1f28d1d: Merge "Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice." 
* commit 'f1f28d1d86aea6dd1419e94aadf051e433914680':
  Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice.
 2014-05-06 02:27:44 +00:00
Elliott Hughes
f1f28d1d86 Merge "Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice." 2014-05-06 02:25:05 +00:00
Yorke Lee
35a543da8d am ea98695e: Merge "Fix nested prescrolling bug in ScrollView" 
* commit 'ea98695e42705c4dc814dc58240e4d14e6a8c245':
  Fix nested prescrolling bug in ScrollView
 2014-05-06 02:22:58 +00:00
Yorke Lee
ccd3a6a519 Merge "Fix nested prescrolling bug in ScrollView" 2014-05-06 02:19:35 +00:00
Igor Viarheichyk
47843df11f Skip resource files for locales en-XA and ar-XB 
during packaging if pseudolocalization was done automatically.
This prevents attemts to add same resource twice.

Change-Id: I51e17f961ac44047bf466ce4aa0d4d17f4ded0d6
 2014-05-05 18:13:41 -07:00
Selim Gurun
4e4cacd684 am 234558e8: Merge "Add frameworks/base changes for enabling reduction proxy" 
* commit '234558e89565d7310e3c12fe72a51b884876abf6':
  Add frameworks/base changes for enabling reduction proxy
 2014-05-06 00:33:55 +00:00
Selim Gurun
c3d8b0f2b0 Merge "Add frameworks/base changes for enabling reduction proxy" 2014-05-06 00:30:50 +00:00
Selim Gurun
a83f1e3d23 Add frameworks/base changes for enabling reduction proxy 
Bug:12492817

Add an experimental webview setting to developer options to enable
data reduction proxy.

Change-Id: Id73d7f5d655a7de18afff766c5c78209c92964ea
 2014-05-05 17:28:04 -07:00
ztenghui
498213a265 First step on API cleaning on the VectorDrawable to disable animation support 
Cleaning on the API level, and related tests.
The animated icon will be only showing the initial state.

TODO: Deep clean on the functionality part and attributes.

Change-Id: I5723bc5b64f796c3a273d74bde02095751160a88
 2014-05-05 17:27:24 -07:00
Justin Koh
22ec7decf3 am 97da4125: am f99fc540: (-s ours) am 34f930f3: Fix build due to docs bug. DO NOT MERGE 
* commit '97da4125e1759871f6966a1bc0410cbc880e52c2':
  Fix build due to docs bug. DO NOT MERGE
 2014-05-06 00:15:38 +00:00
Yohei Yukawa
658bb0ac2e am da878553: Merge "Take supportsSwitchingToNextInputMethod into considertaion" 
* commit 'da878553e4f139536c7b81ba5e57a8577d365bba':
  Take supportsSwitchingToNextInputMethod into considertaion
 2014-05-06 00:15:34 +00:00