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

150395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Wright
89c001db3d am 6e1edc12: Merge "Update MenuItem#setShortcut docs" into lmp-dev 
* commit '6e1edc12a27ab92cd47ccdd588982ee629c0ae97':
  Update MenuItem#setShortcut docs
 2014-08-19 00:41:04 +00:00
Michael Wright
46fc2fb7ea am 504960cb: Merge "Add callbacks for MediaProjection start / stop." into lmp-dev 
* commit '504960cbdc1db1424b1a4181d3860a21a5b7d363':
  Add callbacks for MediaProjection start / stop.
 2014-08-19 00:33:05 +00:00
Svetoslav
4e64956c08 am 4c82c6d7: am 8dab46b4: Merge "Update the print spooler icon." into lmp-dev 
* commit '4c82c6d7ed44adc99af394f069672c87251efddf':
  Update the print spooler icon.
 2014-08-19 00:13:16 +00:00
Adam Lesinski
0ef02eac4e am aae8a25a: am 427964ed: Merge "Include build number in aapt version" into lmp-dev 
* commit 'aae8a25abafd824a7d6f644ca00518029e822a03':
  Include build number in aapt version
 2014-08-19 00:09:12 +00:00
destradaa
b35e41e122 am 8e9d264e: am 420fadbd: Merge "Add @SystemApi annotation to Geofence Hardware types." into lmp-dev 
* commit '8e9d264ef76061bbc33f79cbada560c5461c64b8':
  Add @SystemApi annotation to Geofence Hardware types.
 2014-08-19 00:09:06 +00:00
Svetoslav
128518a942 am 8dab46b4: Merge "Update the print spooler icon." into lmp-dev 
* commit '8dab46b479203b0b5ebad303d97d2eae25dad060':
  Update the print spooler icon.
 2014-08-19 00:05:41 +00:00
Adam Lesinski
40470f995f am 427964ed: Merge "Include build number in aapt version" into lmp-dev 
* commit '427964ed3c2647dcd5669ce77ec387bf71ba13f0':
  Include build number in aapt version
 2014-08-18 23:57:33 +00:00
destradaa
789f5c7986 am 420fadbd: Merge "Add @SystemApi annotation to Geofence Hardware types." into lmp-dev 
* commit '420fadbd5903a2a623ae412dbd416c2a4bf7bde7':
  Add @SystemApi annotation to Geofence Hardware types.
 2014-08-18 23:57:28 +00:00
Christopher Tate
bc19713276 am a710f3b4: am 7a32dd7d: Merge "Minor restore fixes" into lmp-dev 
* commit 'a710f3b4a2aa1c6c6f5131e42e6edee8a8c4f15a':
  Minor restore fixes
 2014-08-18 23:54:14 +00:00
arete
9dae3b831a am d4f0067e: am 4aec0ea8: Merge "Expose system apis for backup transport migration" into lmp-dev 
* commit 'd4f0067eee8db6f0ec581d01a5611174761423c0':
  Expose system apis for backup transport migration
 2014-08-18 23:54:09 +00:00
Deepanshu Gupta
553a4e9138 Add time to status bar and fix wifi icon. 
Add vector drawable for wifi icon. Also add time to the status bar.

Change-Id: I01da833087a607e9bb6ff085929e3844990179f8
 2014-08-18 16:46:29 -07:00
Christopher Tate
15dd21b7d1 am 7a32dd7d: Merge "Minor restore fixes" into lmp-dev 
* commit '7a32dd7dcd913a6b85fa4627f64f589445a1f712':
  Minor restore fixes
 2014-08-18 23:46:24 +00:00
arete
a219adc093 am 4aec0ea8: Merge "Expose system apis for backup transport migration" into lmp-dev 
* commit '4aec0ea84b5ca5e00e2c4d728927931d568fd29c':
  Expose system apis for backup transport migration
 2014-08-18 23:46:19 +00:00
Jae Seo
107c188616 am d90db994: am d733a820: TIF: Fix some comment warnings 
* commit 'd90db994ce07ffaa9512e5af39458d0c241d9f2d':
  TIF: Fix some comment warnings
 2014-08-18 23:37:11 +00:00
Adam Powell
2b74dfa1ac am 9c7cf696: am d3b22a5c: Merge "Fix a bug propagating navigation button events from ToolbarActionBar" into lmp-dev 
* commit '9c7cf696ecb286c90ae19aaaa1e9080a9fb00b4e':
  Fix a bug propagating navigation button events from ToolbarActionBar
 2014-08-18 23:37:07 +00:00
Dongwon Kang
911d0827ca TIF: verify the hardware input ID from getHardwareInputId(). 
This will prevent an input from displaying other tuner inputs.

Change-Id: I77a6b99599eac4a9048a12e2928bc16b34d94343
 2014-08-18 23:33:26 +00:00
Jae Seo
4dbb612c8d am d733a820: TIF: Fix some comment warnings 
* commit 'd733a820cf16126d80ee01e8065ccccf91eee406':
  TIF: Fix some comment warnings
 2014-08-18 23:28:47 +00:00
Adam Powell
c980f48dae am d3b22a5c: Merge "Fix a bug propagating navigation button events from ToolbarActionBar" into lmp-dev 
* commit 'd3b22a5c0b91972a1a938d7c8399971ce04167d7':
  Fix a bug propagating navigation button events from ToolbarActionBar
 2014-08-18 23:28:42 +00:00
Michael Wright
468fef6870 Merge "Persist Show IME option." into lmp-dev 2014-08-18 23:27:42 +00:00
Michael Wright
d1858574d0 Merge "Add callbacks for MediaProjection start / stop." into lmp-dev 2014-08-18 23:27:42 +00:00
arete
4220a9a9f6 Merge "Expose system apis for backup transport migration" into lmp-dev 2014-08-18 23:27:42 +00:00
Jae Seo
5b1caaf7d8 TIF: Fix some comment warnings 
Also fixed some other obvious warnings from Eclipse

Bug: 16876068
Change-Id: Ic9c44caf3fd53e965043aa96039d5f3a5655eaff
 2014-08-18 23:25:48 +00:00
Jake Hamby
cfd22a35da am 31124f44: am bfdc340a: Merge "Add page info in each segment if carrier does not support EMS." into lmp-dev 
* commit '31124f444c6618fdea1cacaa847874be0fba26a7':
  Add page info in each segment if carrier does not support EMS.
 2014-08-18 23:24:58 +00:00
Jeff Sharkey
fbc5d259db am 442dcce1: am 90870a5b: Merge "Progress towards staging ASECs." into lmp-dev 
* commit '442dcce17ee6f656c8a0ec872f3c6730dd603796':
  Progress towards staging ASECs.
 2014-08-18 23:16:36 +00:00
Alan Viverette
6d58ab0346 am 3d3783ec: am 417f92da: Merge "Update fast scroller preview for Material" into lmp-dev 
* commit '3d3783ec27d7b3aafbd08d6695d37543e9a337f8':
  Update fast scroller preview for Material
 2014-08-18 23:16:31 +00:00
Adam Lesinski
5da86bc21a am 4b9b84c5: am f611c1b5: Merge "Revert "Include build number in aapt version"" into lmp-dev 
* commit '4b9b84c5db6b0b6ba629cf64bc894016fe2cf0c1':
  Revert "Include build number in aapt version"
 2014-08-18 23:16:26 +00:00
Jake Hamby
1e3e731f45 am bfdc340a: Merge "Add page info in each segment if carrier does not support EMS." into lmp-dev 
* commit 'bfdc340af5c75fc99cc6abacb72c1ed1a24344a0':
  Add page info in each segment if carrier does not support EMS.
 2014-08-18 23:16:21 +00:00
Jeff Sharkey
3f1b71f0a2 am 90870a5b: Merge "Progress towards staging ASECs." into lmp-dev 
* commit '90870a5bba8cbe540e257c30a8692fc38ed72753':
  Progress towards staging ASECs.
 2014-08-18 23:08:16 +00:00
Alan Viverette
ee9e1a3cc3 am 417f92da: Merge "Update fast scroller preview for Material" into lmp-dev 
* commit '417f92da9ee79296207279cd04fe889e7ebb5cca':
  Update fast scroller preview for Material
 2014-08-18 23:08:11 +00:00
Adam Lesinski
814a6751cf am f611c1b5: Merge "Revert "Include build number in aapt version"" into lmp-dev 
* commit 'f611c1b5d4fd6d6d1e46954a95760c2a0df3d264':
  Revert "Include build number in aapt version"
 2014-08-18 23:08:07 +00:00
Dianne Hackborn
7515b942a8 am a160d4c6: am 3a77663b: Merge "Fix path for handling system window with app token." into lmp-dev 
* commit 'a160d4c612a8d0046b357e77828d2a3e7b4bf8f0':
  Fix path for handling system window with app token.
 2014-08-18 23:04:32 +00:00
Dianne Hackborn
26ac5367c1 am 3a77663b: Merge "Fix path for handling system window with app token." into lmp-dev 
* commit '3a77663bd6a4dd3f06552ed49db03e8c09181ca2':
  Fix path for handling system window with app token.
 2014-08-18 22:56:27 +00:00
Alan Viverette
995ceaa665 am 7152f0fe: am a01596de: Merge "Throw exception when inset drawable is missing drawable attribute" into lmp-dev 
* commit '7152f0fe27b3083ddbc5beb4e109e4215784ba7d':
  Throw exception when inset drawable is missing drawable attribute
 2014-08-18 22:40:33 +00:00
Alan Viverette
b69d55da77 am a01596de: Merge "Throw exception when inset drawable is missing drawable attribute" into lmp-dev 
* commit 'a01596de0264c260aa9b77783bd30e76d43ce6af':
  Throw exception when inset drawable is missing drawable attribute
 2014-08-18 22:32:17 +00:00
Chet Haase
82b074f514 am 9f32e1fb: am 37a522aa: Merge "Fix crash in AnimationDrawable" into lmp-dev 
* commit '9f32e1fbcfa79db47319b5aac6efa7cd8dfd4be4':
  Fix crash in AnimationDrawable
 2014-08-18 22:20:43 +00:00
Chet Haase
6b491ddb14 am 37a522aa: Merge "Fix crash in AnimationDrawable" into lmp-dev 
* commit '37a522aac43cabab58f0653e4bf29897719e9389':
  Fix crash in AnimationDrawable
 2014-08-18 22:12:11 +00:00
Adam Lesinski
98eacc9f0a am fdbcc8e5: am a7ce555e: Include build number in aapt version 
* commit 'fdbcc8e52c90c09a65494c148243bd1e7109b71b':
  Include build number in aapt version
 2014-08-18 22:02:38 +00:00
Adam Lesinski
8e8ef3b151 am a7ce555e: Include build number in aapt version 
* commit 'a7ce555ee82ed91345a54ee171dc9a415b65e134':
  Include build number in aapt version
 2014-08-18 21:53:46 +00:00
George Mount
cd02b48b3d Merge "Set start transform before animator starts." into lmp-dev 2014-08-18 21:31:41 +00:00
George Mount
dbe3655c0b Set start transform before animator starts. 
Bug 16958319

ChangeImageTransform was waiting until the animator started
before setting the image matrix. Animators with a
start delay would leave the ImageView with the final transform
before the animator started.

Change-Id: I5ebc03b58a8697da3edf4a01c8906d60e7938f44
 2014-08-19 16:43:45 +00:00
Jon Miranda
611f8f17f3 Merge "Exposes style and theme data, adds developer option." into lmp-dev 2014-08-18 21:31:41 +00:00
Jon Miranda
836c0a8b94 Exposes style and theme data, adds developer option. 
Adds support for a String[] return type in ViewDebug; and in addition to that,
the hasAdjacentMapping method can use the String array as means to map a key to
its value.

Adds DEBUG_VIEW_ATTRIBUTES to Settings so that the heavy per-view
computations only affect those who opt in. This setting is used in
CoreSettingsObserver to avoid impacting start time.

Change-Id: I8f507e4e5361414c30d247e8d9815205feb5e91f
 2014-08-18 18:32:53 -07:00
Michael Wright
8b987196ca Merge "Update MenuItem#setShortcut docs" into lmp-dev 2014-08-18 21:31:41 +00:00
Alan Viverette
d59c585588 Merge "Update fast scroller preview for Material" into lmp-dev 2014-08-18 21:31:41 +00:00
Alan Viverette
04019ee91b Merge "Throw exception when inset drawable is missing drawable attribute" into lmp-dev 2014-08-18 21:31:41 +00:00
Chet Haase
32e966ccb3 Merge "Fix crash in AnimationDrawable" into lmp-dev 2014-08-18 21:31:41 +00:00
Andrew Solovay
eb60d0f193 am 94174ff7: am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs 
* commit '94174ff788cc6a4f79e2026d7d0995f75246a2de':
  docs: Documented new fields returned by getSkuDetails().
 2014-08-18 21:19:37 +00:00
Andy Hung
8699b1c552 am c089fd1a: am 5c73ba37: Merge "Fix 48kHz limitation on AudioTrack" into lmp-dev 
* commit 'c089fd1a1c33a4390e2c5ed3793b455c231646d1':
  Fix 48kHz limitation on AudioTrack
 2014-08-18 21:12:55 +00:00
Andrew Solovay
94174ff788 am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs 
* commit '8319455afca3dc4c8f799d7752dfa44780cf8855':
  docs: Documented new fields returned by getSkuDetails().
 2014-08-18 21:08:17 +00:00
Adam Lesinski
71809ee7f6 Include build number in aapt version 
Teams are constantly confused over which version of aapt
they are running. Include the build number from the
Android build system in the binary. Can be retrieved by executing
'aapt version'.

Change-Id: Ie4692fb160c7cbe720a8e76b73e435170214fe0e
 2014-08-18 21:08:15 +00:00