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

146622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Ly
0029ef6759 am dadb473e: am 9613b433: Merge "docs: fix typo" into klp-modular-docs 
* commit 'dadb473e2b9dc7bf2691dea7153c6700102e6562':
  docs: fix typo
 2014-07-29 15:42:24 +00:00
Robert Ly
dadb473e2b am 9613b433: Merge "docs: fix typo" into klp-modular-docs 
* commit '9613b433f47162d008f034afbb16deac16532662':
  docs: fix typo
 2014-07-29 15:38:02 +00:00
Ricardo Cervera
7f214e6149 am 8d1aa957: am 652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs 
* commit '8d1aa95729a44a953dd5cd434f2c7380e6d1f641':
  docs: Describe the alloc tracker in Android Studio
 2014-07-29 15:32:57 +00:00
Ricardo Cervera
8d1aa95729 am 652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs 
* commit '652e5c7ef1f8176dc680f7c4ba782164269b03b0':
  docs: Describe the alloc tracker in Android Studio
 2014-07-29 15:29:00 +00:00
Alexandra Gherghina
10ff532a6e am 28e894b5: Rename work icon symbol to match the prefix used for badges. 
* commit '28e894b5e4bf90b99494c151a4ce5875c300b808':
  Rename work icon symbol to match the prefix used for badges.
 2014-07-29 15:27:17 +00:00
Alexandra Gherghina
1f33d77f04 Rename work icon symbol to match the prefix used for badges. 
Also renames the images for consistency.

Bug: 16369104
Change-Id: I19f97ae22cb2ee4f7db210f083badc1a30520b44
 2014-07-29 15:21:01 +00:00
Ricardo Cervera
5ff390be1b am df881ccc: am 321e0302: docs: Fix Wear docs issues. 
* commit 'df881ccc1fe5efefa4a71cf8e5f663f9e2911151':
  docs: Fix Wear docs issues.
 2014-07-29 15:07:56 +00:00
George Mount
c9e21c1179 am b8c728f3: Merge "Allow a "ghost view" that paint a different view from the overlay." into lmp-dev 
* commit 'b8c728f3c62306334f40a559006a41134da8a223':
  Allow a "ghost view" that paint a different view from the overlay.
 2014-07-29 15:03:21 +00:00
Ricardo Cervera
df881ccc1f am 321e0302: docs: Fix Wear docs issues. 
* commit '321e030202cb74cad0dd8a4950cffe361a5072c8':
  docs: Fix Wear docs issues.
 2014-07-29 15:01:11 +00:00
Marcin Kosiba
e4251e7aa7 am 6613e92c: Make webview text encoding and keySystemUUID mapping and error page public. 
* commit '6613e92caf4233a27f91267da5a9c06366b1cdcd':
  Make webview text encoding and keySystemUUID mapping and error page public.
 2014-07-29 14:22:01 +00:00
Lorenzo Colitti
0868f1c112 am 9da11341: Merge "Use getBoundURL for network validation." into lmp-dev 
* commit '9da1134167b117ae3d26ee4dcbf154b1f64fbcea':
  Use getBoundURL for network validation.
 2014-07-29 14:17:14 +00:00
George Mount
5280bed8ab am 3356ef9d: Add default propagation back to Explode. 
* commit '3356ef9d0a4f7ebde7d0acbbb4f09658bc63e4cb':
  Add default propagation back to Explode.
 2014-07-29 14:17:09 +00:00
Marcin Kosiba
eed396f792 Make webview text encoding and keySystemUUID mapping and error page public. 
These resources will need to be accessed from the APK-bundled
WebView and therefore need to be made public.

BUG: 11505352
Change-Id: I5e988671cc8342ed4146a90b4de1246460232050
 2014-07-29 15:17:07 +01:00
George Mount
964c3cf5b2 Add default propagation back to Explode. 
Bug 16217557

Change-Id: I47460db128749af978077755a777068392492aee
 2014-07-29 14:13:00 +00:00
Adrian Roos
796762e827 am c7af998e: Merge "Make TrustAgentService a SystemApi" into lmp-dev 
* commit 'c7af998e0719da01c4656a57e7bf1b44af640b9e':
  Make TrustAgentService a SystemApi
 2014-07-29 13:19:13 +00:00
Narayan Kamath
11b86083e3 am 676513ad: Merge "Fix regression in renderscript detection." into lmp-dev 
* commit '676513ad1f865b137d3f053602748867afe40b0f':
  Fix regression in renderscript detection.
 2014-07-29 13:08:44 +00:00
Jorim Jaggi
ee73547e1b am 2e0d19f1: Remove WindowManager.LayoutParams.TYPE_KEYGUARD (1/2) 
* commit '2e0d19f133ffbae6f5f40f7acae5601f33b4c895':
  Remove WindowManager.LayoutParams.TYPE_KEYGUARD (1/2)
 2014-07-29 13:01:28 +00:00
Zoltan Szatmary-Ban
34f3b71357 am 9635719f: Update Data Usage Settings for Enterprise 
* commit '9635719fc8e9d5fbd053693e2a7ace9086141e57':
  Update Data Usage Settings for Enterprise
 2014-07-29 12:49:31 +00:00
Jim Miller
1e8d54d55c am 502aab60: Merge "Add new DevicePolicyManager API to allow fine-grained TrustAgent management" into lmp-dev 
* commit '502aab60c8c8f9d57c7a3b6a9468975adb6fc3a2':
  Add new DevicePolicyManager API to allow fine-grained TrustAgent management
 2014-07-29 12:48:38 +00:00
Jorim Jaggi
e411fdfa4c Remove WindowManager.LayoutParams.TYPE_KEYGUARD (1/2) 
Change-Id: I5d234dc4383bbf205bde1a0e7f1e8266fc37d13a
 2014-07-29 14:43:03 +02:00
Zoltan Szatmary-Ban
e37e43d0bd Update Data Usage Settings for Enterprise 
Applications of the managed profile are shown
with badged icon on the "Data Usage" app list.
A total of managed profile data usage (if any)
is displayed top of the list.

Bug: 15466834

Change-Id: Ie75fb0ddc240ea1e5d1097feda7b7b5931256fcb
 2014-07-29 10:21:43 +01:00
vandwalle
5c593ab1df am 5029e1f3: Merge "fix typo in scanresult" into lmp-dev 
* commit '5029e1f37def8ebbf4e80e44d8b5e10a222987af':
  fix typo in scanresult
 2014-07-29 04:01:30 +00:00
vandwalle
01990135b2 am c7c85579: Merge "add debug info to wificonfiguration dump" into lmp-dev 
* commit 'c7c8557933bd3b14c4ff03d4f7df9d78a136b746':
  add debug info to wificonfiguration dump
 2014-07-29 03:42:18 +00:00
John Spurlock
73a8ae3cea am 0eeaaa39: Merge "Zen: Classify notifications using the alarm stream." into lmp-dev 
* commit '0eeaaa39d06777adf5133b6dd0c037d93584f9a6':
  Zen: Classify notifications using the alarm stream.
 2014-07-29 03:38:03 +00:00
Sailesh Nepal
a0dbc5366d am 66928fc9: Merge "Fix WTF when creating a lazily initialized connection" into lmp-dev 
* commit '66928fc9d90534598528b91c0628245d3c1d77fc':
  Fix WTF when creating a lazily initialized connection
 2014-07-29 03:37:58 +00:00
John Spurlock
d22c30cc3e am e78d5af1: Merge "Settings: Constants for notification settings." into lmp-dev 
* commit 'e78d5af1b7ffc819eff52afff82e11453295e01d':
  Settings: Constants for notification settings.
 2014-07-29 02:15:23 +00:00
Sailesh Nepal
b61eae1d19 am 53522516: Handle synchronous failed connection 
* commit '535225161324a4da618d6c12597ec95948916351':
  Handle synchronous failed connection
 2014-07-29 01:55:56 +00:00
Sailesh Nepal
4e7ec71e64 Handle synchronous failed connection 
Change-Id: I406ccbdd1f70c85456b6e0d689332cf40a756707
 2014-07-29 01:46:57 +00:00
Filip Gruszczynski
c6f72ec4eb am 005ec21c: am 896a82d7: am d0e03392: Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev 
* commit '005ec21c2c56434c8fd81243a7e3a11d68176501':
  Fix double chin issue, where bottom inset is applied twice.
 2014-07-29 01:14:34 +00:00
Craig Mautner
f7035e5cd7 am 842e4132: am 09875ec7: am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev 
* commit '842e41322daa8edc387372dfea76f05506da7235':
  Remove PendingActivityLaunches based on stack.
 2014-07-29 01:14:30 +00:00
Filip Gruszczynski
0fa59b898a am 896a82d7: am d0e03392: Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev 
* commit '896a82d77e732c7387b2279bcdd0f04d696b13df':
  Fix double chin issue, where bottom inset is applied twice.
 2014-07-29 01:08:09 +00:00
Craig Mautner
7544c82997 am 09875ec7: am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev 
* commit '09875ec7292b19e07c38b6127406d6aa7490e26c':
  Remove PendingActivityLaunches based on stack.
 2014-07-29 01:07:59 +00:00
Robert Greenwalt
9049775700 am 89a20049: Merge "Remove dead code 3." into lmp-dev 
* commit '89a200494f82371c1238d21a23c22a6ec5d41e82':
  Remove dead code 3.
 2014-07-29 00:59:59 +00:00
John Spurlock
25a27c7d3a am 5c93904b: Zen: follow independent ringer mode changes. 
* commit '5c93904b3aee698306d67521446d72ece3a4ef96':
  Zen: follow independent ringer mode changes.
 2014-07-29 00:47:55 +00:00
Sreeram Ramachandran
aa19b10ec7 am bce2867e: Allow VPNs to add/remove link addresses dynamically. 
* commit 'bce2867ef034e8b658d809dca76194456990b328':
  Allow VPNs to add/remove link addresses dynamically.
 2014-07-29 00:47:51 +00:00
John Spurlock
8c01d88208 Zen: follow independent ringer mode changes. 
Bug:16624498
Change-Id: Ib623118970a82c8406c714687b1b516378fe7824
 2014-07-28 20:39:17 -04:00
Sreeram Ramachandran
f4e0c0cb8e Allow VPNs to add/remove link addresses dynamically. 
Bug: 15409819
Change-Id: If91fc6891d7ce04060362c6cde8c57462394c4e8
 2014-07-29 00:32:59 +00:00
Riley Andrews
49d06dccc6 am d85845c6: Merge "Add cursor flags into SpriteController to suppor async cursor updates. - This is fairly blindly taken from nvidia\'s implementation." into lmp-dev 
* commit 'd85845c6e00fb56d618f280b8ff7a03c12af8623':
  Add cursor flags into SpriteController to suppor async cursor updates. - This is fairly blindly taken from nvidia's implementation.
 2014-07-28 23:59:13 +00:00
Filip Gruszczynski
896a82d77e am d0e03392: Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev 
* commit 'd0e03392394164e1e261ef8829e187ad2362d426':
  Fix double chin issue, where bottom inset is applied twice.
 2014-07-28 23:40:13 +00:00
Craig Mautner
09875ec729 am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev 
* commit '0fa45d93f7265c130d5dc49a51130ed74db5cec9':
  Remove PendingActivityLaunches based on stack.
 2014-07-28 23:28:59 +00:00
Winson Chung
12b1a4047a am 7097f6e8: Merge "Updating lock-to-app look." into lmp-dev 
* commit '7097f6e8d539d8694ed815b83936ed3d21ff057d':
  Updating lock-to-app look.
 2014-07-28 23:27:09 +00:00
Christopher Tate
d7f8fdf4ef am 3c4efc3e: Merge "Provide outside-facing API for data management intent+label" into lmp-dev 
* commit '3c4efc3ed95aeaf30d940b6a7f1ccf69eb7f9bfa':
  Provide outside-facing API for data management intent+label
 2014-07-28 23:27:04 +00:00
Baligh Uddin
900800e4c2 am 43fa0c1a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '43fa0c1a33f92e6dbf60f649456f23128e21112e':
  Import translations. DO NOT MERGE
 2014-07-28 23:20:54 +00:00
Baligh Uddin
0919b11f6f am e47f344c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e47f344c49b58d85a6f3c9bb58e7b188505bdec5':
  Import translations. DO NOT MERGE
 2014-07-28 23:20:50 +00:00
Baligh Uddin
7b7e24bd6a am c7fa2051: (-s ours) Import translations. DO NOT MERGE 
* commit 'c7fa2051e8668500b16cae779360ead61d54c16a':
  Import translations. DO NOT MERGE
 2014-07-28 23:20:46 +00:00
Jinsuk Kim
3a6de8c605 am c6a4ac34: Merge "Add MHL getPortInfo" into lmp-dev 
* commit 'c6a4ac34865c844a30fe9836c264d0da1688e9db':
  Add MHL getPortInfo
 2014-07-28 23:15:35 +00:00
Baligh Uddin
df84404d58 Import translations. DO NOT MERGE 
Change-Id: I1fcd1e840d7fbcc47d41e1dc997b685b6c4b9205
Auto-generated-cl: translation import
 2014-07-28 23:12:31 +00:00
Eric Laurent
a6143a974a am 2649acb4: rename AudioSystem::newAudioSessionId() 
* commit '2649acb4fcbf59c29b55916b5bf7237157a21ffa':
  rename AudioSystem::newAudioSessionId()
 2014-07-28 22:47:45 +00:00
Yin-Chia Yeh
478db221eb am 9c65a371: Merge "Camera2: Fix wrong usage of toArray" into lmp-dev 
* commit '9c65a371063acb6fff6c23e695b06c20ce943b54':
  Camera2: Fix wrong usage of toArray
 2014-07-28 22:47:34 +00:00
Robert Greenwalt
b71748552c am 1829b111: Merge "Remove dead code 2." into lmp-dev 
* commit '1829b111f11c2813488e427c3505d5cbf7c96597':
  Remove dead code 2.
 2014-07-28 22:47:29 +00:00