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

149222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
478114cb7c Merge "Allow enum generated IDs to reuse existing IDs" into lmp-dev 2014-08-19 02:43:23 +00:00
Adam Lesinski
43a0df04b0 Allow enum generated IDs to reuse existing IDs 
Change-Id: Ida5dbbce1c4ecb0a4e57511555cec6448737be25
 2014-08-19 03:46:00 +00:00
Igor Murashkin
7064dd65d8 Merge "camera2: legacy: disable shutter sounds unconditionally via camera2 api" into lmp-dev 2014-08-19 02:43:23 +00:00
Igor Murashkin
6653362f6b camera2: legacy: disable shutter sounds unconditionally via camera2 api 
Bug: 17109582
Change-Id: Ieb3fc61ff111d792cc657c018e278349c25472cf
 2014-08-19 15:11:31 -07:00
Alan Viverette
9a0360e7b9 Merge "Fix button text color, reduce alert dialog padding" into lmp-dev 2014-08-19 02:43:23 +00:00
ztenghui
55e9affe5b Merge "Update indeterminate linear progress bar" into lmp-dev 2014-08-19 02:43:23 +00:00
ztenghui
262e252753 Update indeterminate linear progress bar 
b/14622065

Change-Id: I1366ecd5e265f5acc31a0ec6281de6e345a8464b
 2014-08-19 22:14:26 +00:00
Chris Craik
0c66436b86 Merge "Update setShadowLayer doc" into lmp-dev 2014-08-19 02:43:23 +00:00
Chris Craik
d1d7389880 Update setShadowLayer doc 
bug:17134528
Change-Id: I436bb0163b18d0b88954bf9dac16e51d14a533eb
 2014-08-19 22:40:41 +00:00
Chris Craik
83f75c88a0 Merge "Early reject drawText calls that will not draw" into lmp-dev 2014-08-19 02:43:23 +00:00
Chris Craik
947eabf42d Early reject drawText calls that will not draw 
bug:17114102

Prevents high contrast text from drawing invisible text.

Also fixes stroked text bounds calculation.

Change-Id: Iaeff51ead8b7b8ef2a1a0ca8b89598564e0d443f
 2014-08-19 14:14:38 -07:00
Adam Powell
75d6bc1aee Merge "Make Toolbars (and Toolbar-based ActionBars) have constant text size" into lmp-dev 2014-08-19 02:43:23 +00:00
Adam Powell
2c818ca0a5 Make Toolbars (and Toolbar-based ActionBars) have constant text size 
Bug 16397655

Change-Id: I908feb1c0a44e4d6061ed49a81c326c841bb2e7c
 2014-08-19 11:11:42 -07:00
Adam Lesinski
1bd805c943 Merge "Add Shell command to set AppOps permissions" into lmp-dev 2014-08-19 02:43:23 +00:00
Adam Lesinski
b5cf61be7c Add Shell command to set AppOps permissions 
Change-Id: I6446543b27f0d2d2e69590a2807e713c6d5ccbbc
 2014-08-19 11:27:19 -07:00
Amith Yamasani
7376a44b57 Merge "Rephrase the Exit guest action and dialog text" into lmp-dev 2014-08-19 02:43:23 +00:00
Tim Murray
6825368df4 Merge "Stop sign-extending RS IDs." into lmp-dev 2014-08-19 02:43:23 +00:00
Tim Murray
265858ca11 Merge "Fix IO_INPUT with 64-bit." into lmp-dev 2014-08-19 02:43:23 +00:00
Shishir Agrawal
a34bdb18c5 Merge "Add public qualifier to TelephonyManager.TeleiccExchangeSimIO." into lmp-dev 2014-08-19 02:43:23 +00:00
Igor Murashkin
3a6eba01c4 Merge "camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader" into lmp-dev 2014-08-19 02:43:23 +00:00
Igor Murashkin
517b74533a camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader 
Return empty array since no implementation-defined sizes are supported

Bug: 17007153
Change-Id: I178e89ef6b2640896f8657765beb458022d66ae5
 2014-08-19 10:51:30 -07:00
Igor Murashkin
ae0da7a81c Merge "camera2: (Legacy) Add control.sceneMode = DISABLED to templates" into lmp-dev 2014-08-19 02:43:23 +00:00
Igor Murashkin
981952d07a camera2: (Legacy) Add control.sceneMode = DISABLED to templates 
Bug: 17024375
Change-Id: Ie4e2a7f22caa842b4f3850f3739f22c5f6a9b88f
 2014-08-19 11:04:31 -07:00
Alan Viverette
469b0c1f23 Fix button text color, reduce alert dialog padding 
Material.Button was inheriting from the default Button style, which
incorrectly set textColor (thus overriding the value from the text
appearance).

BUG: 17047363
BUG: 17111560
Change-Id: I74a8fb865bbb7262afd7eb1328e2173e9b74c175
 2014-08-19 02:37:59 +00:00
Jungshik Jang
a70c0c6220 am d9910efb: Merge "Remove parameter field in HdmiCecKeycode." into lmp-dev 
* commit 'd9910efb19df1b7aaebfc21d9f74977159d1b9f0':
  Remove parameter field in HdmiCecKeycode.
 2014-08-19 02:33:49 +00:00
Dongwon Kang
79fc32794c Merge "TIF: verify the hardware input ID from getHardwareInputId()." into lmp-dev 2014-08-19 02:08:36 +00:00
Dianne Hackborn
84c9e03543 am 0dafd7dc: Merge "Fix issue #17114392: android.com.phone crashes - PackageManager code" into lmp-dev 
* commit '0dafd7dceccde18aaa9eac05c77d035df979d88f':
  Fix issue #17114392: android.com.phone crashes - PackageManager code
 2014-08-19 01:25:41 +00:00
Ji-Hwan Lee
3812cc0e69 am 16b1d44e: Merge "TIF: Remove session state when hardware wrapper input crashes" into lmp-dev 
* commit '16b1d44eea546f0ac4144f8cfbb847f9b880bfb6':
  TIF: Remove session state when hardware wrapper input crashes
 2014-08-19 01:16:21 +00:00
Tim Murray
3aa89c1e24 Stop sign-extending RS IDs. 
bug 16846318
bug 17006933

Change-Id: I6b1e73ed983ec583e80dc532e38c2ae2e504e608
 2014-08-18 18:14:54 -07:00
Tim Murray
b730d866a0 Fix IO_INPUT with 64-bit. 
bug 16846318
bug 17006933

Change-Id: Ic13ef26875d8a6fab1ffb542d62038b768a536ff
 2014-08-18 18:14:32 -07:00
Dianne Hackborn
40c6841294 am 8c1c4875: Merge "Temporary: raise overflow limit, print all wake locks." into lmp-dev 
* commit '8c1c48751db6c82826050f2bdde4c98c1aec8cd6':
  Temporary: raise overflow limit, print all wake locks.
 2014-08-19 00:52:53 +00:00
Michael Wright
4981b00356 am e835a130: Merge "Persist Show IME option." into lmp-dev 
* commit 'e835a1305ff2b493f9488125c17314ff7bf34c22':
  Persist Show IME option.
 2014-08-19 00:41:10 +00:00
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
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
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
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
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