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

159491 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
7165bc0ea6 am ba55f973: (-s ours) am 7c2c9cce: (-s ours) am ff1198e5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'ba55f973d1a0efdc88dff6e48fa949530f26afc8':
  Import translations. DO NOT MERGE
 2014-09-22 19:44:08 +00:00
Baligh Uddin
d5afa52261 am 7d482ca9: (-s ours) am 5ef015e2: (-s ours) am 5adb5a18: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '7d482ca9a29b1e6b4fb37e0d6f9ea8ff2995a31a':
  Import translations. DO NOT MERGE
 2014-09-22 19:44:05 +00:00
Baligh Uddin
4e42fe4272 am 97926aae: (-s ours) am 22f813a1: (-s ours) am 906ba6b9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '97926aae5a85790474674ac82c899cfc5c3cbe34':
  Import translations. DO NOT MERGE
 2014-09-22 19:44:00 +00:00
John Spurlock
707b6d7a9f am 082c2b49: am b22dc016: am 7e5776e1: am bfaadc6b: Merge "Mark sysui config resource as untranslatable." into lmp-dev 
* commit '082c2b4924387b7635ea2b19a110c5f465833773':
  Mark sysui config resource as untranslatable.
 2014-09-22 19:43:54 +00:00
Alan Viverette
c1f82f5254 am 8183ba88: am 0dfa4738: Merge "Pass explicit null theme when preloading drawables" into lmp-dev 
* commit '8183ba888f70ecf34adc7f02389f86f7c78a0aef':
  Pass explicit null theme when preloading drawables
 2014-09-22 19:37:47 +00:00
John Spurlock
101b785d42 Merge "Doze: Fix NPE found when pulsing and !dozing." into lmp-dev 2014-09-22 19:35:55 +00:00
John Spurlock
b9e9729887 Merge "Zen: Add content description to settings icon." into lmp-dev 2014-09-22 19:35:12 +00:00
Yohei Yukawa
41dd4dff4e am 79a12ba6: am 8fe1ca2c: am b5d063dc: Merge "Work on issue #17506095: Plumb a new configuration to IMMS" into lmp-dev 
* commit '79a12ba6e6ab5104579bab2ad765c61263ed56be':
  Work on issue #17506095: Plumb a new configuration to IMMS
 2014-09-22 19:32:09 +00:00
Adam Lesinski
534b739118 am 37e3df38: am 1aa4db07: am 81745c51: Merge "AAPT: Continuation of public/private attribute fix" into lmp-dev 
* commit '37e3df38b6034f97dc6d2d3918b58d4bd0eeb751':
  AAPT: Continuation of public/private attribute fix
 2014-09-22 19:32:06 +00:00
Przemyslaw Szczepaniak
227079a370 am 32190676: am 90ae2778: am 299bb1fb: Fix issues with new TTS API 
* commit '32190676f55713bce74571c123c7903004c9c383':
  Fix issues with new TTS API
 2014-09-22 19:32:02 +00:00
Jason Monk
797f722e29 am 1555ed94: am eeda2131: am 5c2ecf24: Merge "Announce title of QS detail views" into lmp-dev 
* commit '1555ed941dd153fdbd4d47e4b500cb326e1d04ba':
  Announce title of QS detail views
 2014-09-22 19:31:58 +00:00
Jason Monk
f09cadc6a3 am 78f7385f: am f09fda20: am f9d996c1: Fix status bar cast icon not updating 
* commit '78f7385f9663d809f066225c7a39b69363976302':
  Fix status bar cast icon not updating
 2014-09-22 19:31:54 +00:00
Ruben Brunk
1780cbc7a9 am d314f286: am ee38cd33: am 3b57d98a: Merge changes Iccd4d53d,Id449bc7a into lmp-dev 
* commit 'd314f286e04e4b61579936699407097ede030873':
  camera2: Avoid setting null metering regions in LEGACY.
  camera2: Fix JPEG orientation set by LEGACY request.
 2014-09-22 19:31:50 +00:00
John Spurlock
5f60e02208 am d613437b: am 797fd661: am 61ffcaca: Merge "Doze: Ensure a doze reset happens after leaving keyguard." into lmp-dev 
* commit 'd613437ba4eb18c12135295fc743e37011fb2f9b':
  Doze: Ensure a doze reset happens after leaving keyguard.
 2014-09-22 19:31:46 +00:00
Yigit Boyar
6c55dfc8cd am 0b380581: am a9faefb3: am a0716928: Merge "Allow fallback to Toolbar\'s default Navigation Icon" into lmp-dev 
* commit '0b3805812b2dcf096433e310ee2567f33849eec8':
  Allow fallback to Toolbar's default Navigation Icon
 2014-09-22 19:31:42 +00:00
Sailesh Nepal
a6eea02a2d am 4489d205: am 55c58d01: am 5fb8a942: Merge "Pass disconnect reason for failed remote connections" into lmp-dev 
* commit '4489d20521becf59a88f692ec3357e599547aa0a':
  Pass disconnect reason for failed remote connections
 2014-09-22 19:31:38 +00:00
Ruben Brunk
37c253a469 am 6e13d7fd: am 252bfab5: am 6a80927a: Merge "camera2: refactor LEGACY mode error handling." into lmp-dev 
* commit '6e13d7fda270cc80f7848d6c9d18b3a209a9e755':
  camera2: refactor LEGACY mode error handling.
 2014-09-22 19:31:34 +00:00
Baligh Uddin
129996a107 am 3ddd98e6: (-s ours) am b360a75b: (-s ours) am 6564aa05: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '3ddd98e666aa0707941be57d92cf82fb7d94ec27':
  Import translations. DO NOT MERGE
 2014-09-22 19:31:30 +00:00
Baligh Uddin
87d0fbe299 am 7e4861c5: (-s ours) am df22ae1a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '7e4861c565fcd8ac68ece1ce09a6ceda1e162310':
  Import translations. DO NOT MERGE
 2014-09-22 19:31:26 +00:00
Svetoslav
2efc70c492 am 35c764cf: am 562f38ee: am 23e6a244: Merge "Fix memory leak in accessibility cache." into lmp-dev 
* commit '35c764cf373b2c6def26fd154d6c27033ea69dc8':
  Fix memory leak in accessibility cache.
 2014-09-22 19:31:21 +00:00
Baligh Uddin
436a6165ea am 678f5326: (-s ours) am 6dce2b37: (-s ours) am c9d9fbf9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '678f5326f708b434d716cc75e7eccb0a189b33d8':
  Import translations. DO NOT MERGE
 2014-09-22 19:31:17 +00:00
Baligh Uddin
e0e85e76a7 am d08f14f9: (-s ours) am c125603b: (-s ours) am 569d3d30: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'd08f14f9405b97deb2a60bb06481b3a6687008d1':
  Import translations. DO NOT MERGE
 2014-09-22 19:31:13 +00:00
Baligh Uddin
53091b85bc am bb2685a8: (-s ours) am b2ad2913: (-s ours) am 5ed716c1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'bb2685a87b5610fab2818ed4d0acb29e935880b9':
  Import translations. DO NOT MERGE
 2014-09-22 19:31:10 +00:00
Baligh Uddin
1b3f911266 am 7c2c9cce: (-s ours) am ff1198e5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '7c2c9ccee2b04d68d649276bfbec5718ada5665d':
  Import translations. DO NOT MERGE
 2014-09-22 19:31:06 +00:00
Svetoslav
c616b3e2f1 Fix a bug in parsing app widget state XML. 
When restoring app widget state from XML we read all providers,
hosts, and widgets and only after reading all hosts and providers
for all members of the group we hookup the widgets as they may
cross profile boundary. To esntablish the host-widget and provider-
widget relation we use a tag for the host and the provider that
are assigned before saving the state to XML. When restoring we
are using the tags to match widgets with hosts and providers. The
bug was that we were not clearing the tag of all hosts and providers
before reading from XML as we want the only tags that are defined
to be the ones we are reading. This resulted in wrong app widget
restore for a secondary user.

bug:17505027

Change-Id: I035d8f13142c6b9dbc9d658b82390f9cd8d75e0d
 2014-09-22 12:31:04 -07:00
Baligh Uddin
e77cbb3477 am 5ef015e2: (-s ours) am 5adb5a18: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '5ef015e224b8e4772cb6d66308822e40b90c4d99':
  Import translations. DO NOT MERGE
 2014-09-22 19:31:02 +00:00
Baligh Uddin
4b9192b875 am 22f813a1: (-s ours) am 906ba6b9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '22f813a19267da6a66a7badb7369b863965ce4ad':
  Import translations. DO NOT MERGE
 2014-09-22 19:30:58 +00:00
John Spurlock
cfa5d64b50 am b22dc016: am 7e5776e1: am bfaadc6b: Merge "Mark sysui config resource as untranslatable." into lmp-dev 
* commit 'b22dc016464e3dbfda19c18a31f77a41a254b99e':
  Mark sysui config resource as untranslatable.
 2014-09-22 19:30:54 +00:00
Alan Viverette
d14f290d40 am 0dfa4738: Merge "Pass explicit null theme when preloading drawables" into lmp-dev 
* commit '0dfa4738018b93f576a3fceee2d351505983961f':
  Pass explicit null theme when preloading drawables
 2014-09-22 19:25:06 +00:00
John Spurlock
58a28eb85e Doze: Fix NPE found when pulsing and !dozing. 
Bug:17390492
Change-Id: Id6665c5bb8fa13ee08f68478c601b77a4f9e3f6a
 2014-09-22 15:20:52 -04:00
Yohei Yukawa
6ddf9aa85f am 8fe1ca2c: am b5d063dc: Merge "Work on issue #17506095: Plumb a new configuration to IMMS" into lmp-dev 
* commit '8fe1ca2cbbe8334ac4f647f15c04e3cb2189ba3e':
  Work on issue #17506095: Plumb a new configuration to IMMS
 2014-09-22 19:20:37 +00:00
Adam Lesinski
9dedbbe49c am 1aa4db07: am 81745c51: Merge "AAPT: Continuation of public/private attribute fix" into lmp-dev 
* commit '1aa4db0722f8b73472ec4a4f91626283bed665a7':
  AAPT: Continuation of public/private attribute fix
 2014-09-22 19:20:33 +00:00
Przemyslaw Szczepaniak
0624dabd40 am 90ae2778: am 299bb1fb: Fix issues with new TTS API 
* commit '90ae27788d261b331fde781fe06b4309d922d35c':
  Fix issues with new TTS API
 2014-09-22 19:20:27 +00:00
Jason Monk
2e38545c30 am eeda2131: am 5c2ecf24: Merge "Announce title of QS detail views" into lmp-dev 
* commit 'eeda2131cd07a4d2aabca383da015035ce93c20f':
  Announce title of QS detail views
 2014-09-22 19:19:59 +00:00
Jason Monk
a02aea152d am f09fda20: am f9d996c1: Fix status bar cast icon not updating 
* commit 'f09fda20edae6a126513c658a89eec15361382fa':
  Fix status bar cast icon not updating
 2014-09-22 19:19:55 +00:00
Ruben Brunk
909cfbe062 am ee38cd33: am 3b57d98a: Merge changes Iccd4d53d,Id449bc7a into lmp-dev 
* commit 'ee38cd33a91f9c153ef2b12d383766a314dfd95a':
  camera2: Avoid setting null metering regions in LEGACY.
  camera2: Fix JPEG orientation set by LEGACY request.
 2014-09-22 19:19:39 +00:00
John Spurlock
453b35e2c4 am 797fd661: am 61ffcaca: Merge "Doze: Ensure a doze reset happens after leaving keyguard." into lmp-dev 
* commit '797fd661e8bbe504dfb4378ac10de1181dc62f6b':
  Doze: Ensure a doze reset happens after leaving keyguard.
 2014-09-22 19:19:35 +00:00
Yigit Boyar
ccf5d24b7a am a9faefb3: am a0716928: Merge "Allow fallback to Toolbar\'s default Navigation Icon" into lmp-dev 
* commit 'a9faefb370e9eb63ffd956507f7f854a89122759':
  Allow fallback to Toolbar's default Navigation Icon
 2014-09-22 19:19:15 +00:00
Sailesh Nepal
4014ff4daf am 55c58d01: am 5fb8a942: Merge "Pass disconnect reason for failed remote connections" into lmp-dev 
* commit '55c58d019c744c52e7b8e4451007371b55eb1127':
  Pass disconnect reason for failed remote connections
 2014-09-22 19:19:02 +00:00
Ruben Brunk
ee99c63f75 am 252bfab5: am 6a80927a: Merge "camera2: refactor LEGACY mode error handling." into lmp-dev 
* commit '252bfab5897109603cd009e9cb8a73e0622c2a10':
  camera2: refactor LEGACY mode error handling.
 2014-09-22 19:18:56 +00:00
Baligh Uddin
295a352bac am b360a75b: (-s ours) am 6564aa05: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'b360a75b81f26a67bfc77ad6c92a23fac400de96':
  Import translations. DO NOT MERGE
 2014-09-22 19:18:35 +00:00
Baligh Uddin
c6dbf0751a am df22ae1a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'df22ae1ac964344cb7f24ecfad0fb7b370138da3':
  Import translations. DO NOT MERGE
 2014-09-22 19:18:26 +00:00
Svetoslav
8d109485ab am 562f38ee: am 23e6a244: Merge "Fix memory leak in accessibility cache." into lmp-dev 
* commit '562f38ee11c9bc5dc20e5fe8740dfea9ab54db42':
  Fix memory leak in accessibility cache.
 2014-09-22 19:18:22 +00:00
Baligh Uddin
0fdff82ac4 am 6dce2b37: (-s ours) am c9d9fbf9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '6dce2b37c2c49163529b912ba792e520a722f813':
  Import translations. DO NOT MERGE
 2014-09-22 19:18:19 +00:00
Baligh Uddin
5918a38cc8 am c125603b: (-s ours) am 569d3d30: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'c125603bcf674f22b41220f18d68fd42af13b610':
  Import translations. DO NOT MERGE
 2014-09-22 19:18:15 +00:00
Baligh Uddin
345e878a79 am b2ad2913: (-s ours) am 5ed716c1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'b2ad291364fdeea44b1d95269b4274c7808de53c':
  Import translations. DO NOT MERGE
 2014-09-22 19:18:11 +00:00
Baligh Uddin
12842040ed am ff1198e5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'ff1198e57df6a9827c3dac5405ba19f568d7cf32':
  Import translations. DO NOT MERGE
 2014-09-22 19:18:07 +00:00
Baligh Uddin
b5acf9bfc1 am 5adb5a18: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '5adb5a18ccb1b79adfce925da1012ec580baf636':
  Import translations. DO NOT MERGE
 2014-09-22 19:18:04 +00:00
Alan Viverette
e786895918 Merge "Pass explicit null theme when preloading drawables" into lmp-dev 2014-09-22 19:18:03 +00:00
Baligh Uddin
4413889dbc am 906ba6b9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '906ba6b951c241c254f3257a2ed81663ff11f39b':
  Import translations. DO NOT MERGE
 2014-09-22 19:18:00 +00:00