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

150544 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Solovay
7cb2570a0a am 338c46a1: am eb60d0f1: am 94174ff7: am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs 
* commit '338c46a18d5d7f2715248b4d512c9de559843864':
  docs: Documented new fields returned by getSkuDetails().
 2014-08-19 05:59:55 +00:00
Andrew Solovay
fc6b01f463 am eb60d0f1: am 94174ff7: am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs 
* commit 'eb60d0f1937392351ef81f10b651749bd47f7898':
  docs: Documented new fields returned by getSkuDetails().
 2014-08-19 05:52:57 +00:00
Jaewan Kim
99eb59cbe1 am 8e04501a: am ecd7d762: Merge "Fix NPE when passing null TvContentRating" into lmp-dev 
* commit '8e04501a425dc4cf34833d4cd87655af30efe923':
  Fix NPE when passing null TvContentRating
 2014-08-19 05:12:14 +00:00
Jaewan Kim
8b1b8a302c am ecd7d762: Merge "Fix NPE when passing null TvContentRating" into lmp-dev 
* commit 'ecd7d762a47ad1a387db26c2b9ddc59ab310f00f':
  Fix NPE when passing null TvContentRating
 2014-08-19 05:03:07 +00:00
Dongwon Kang
54557f34d9 am ad741c97: am 7c2ae217: Merge "TIF: verify the hardware input ID from getHardwareInputId()." into lmp-dev 
* commit 'ad741c9789f351ce2d05af4d4c0b85ebf2f2d7e0':
  TIF: verify the hardware input ID from getHardwareInputId().
 2014-08-19 04:25:05 +00:00
Dongwon Kang
2a9af92880 am 7c2ae217: Merge "TIF: verify the hardware input ID from getHardwareInputId()." into lmp-dev 
* commit '7c2ae2177f1163a80822535adbf013edeb615ad2':
  TIF: verify the hardware input ID from getHardwareInputId().
 2014-08-19 04:10:41 +00:00
Jon Miranda
16adbb4222 am 4a5ac7db: am b315ca55: Merge "Exposes style and theme data, adds developer option." into lmp-dev 
* commit '4a5ac7db49117b5d14e82caca68405949eccfec5':
  Exposes style and theme data, adds developer option.
 2014-08-19 03:10:22 +00:00
Jon Miranda
19d65ad016 am b315ca55: Merge "Exposes style and theme data, adds developer option." into lmp-dev 
* commit 'b315ca55a9da8857ebe15547f59b333891cf7ed4':
  Exposes style and theme data, adds developer option.
 2014-08-19 02:58:25 +00:00
Chris Craik
2262abbd16 Respect round rect clip when determining op opaqueness 
bug:17115570
Change-Id: I30184b4678d333b5d222af8b61daa07a5e865cab
 2014-08-18 19:55:36 -07:00
Jungshik Jang
59b9c3f75a am 4e8baac5: am d9910efb: Merge "Remove parameter field in HdmiCecKeycode." into lmp-dev 
* commit '4e8baac5e77a54737bfad8180bc8ee832adf4b74':
  Remove parameter field in HdmiCecKeycode.
 2014-08-19 02:54:52 +00:00
RoboErik
47a7d247ef Merge "Api updates to MediaSession components" into lmp-dev 2014-08-19 02:43:23 +00:00
RoboErik
d2b8c947dd Api updates to MediaSession components 
-renames get/setBufferPosition to get/setBufferedPosition
-renames getLaunchActivity to getSessionActivity
-adds doc link to setVolumeTo flags param
-renames setLaunchActivity to setSessionActivity
-hides setMediaRouter
-moves PLAYBACK_TYPE_ constants to MediaController.AudioInfo
-adds addOnActiveSessionsChangedListener version with a handler parameter
-renames AudioInfo to PlaybackInfo

bug:17114404
Change-Id: I0fbfe4eb979cb2af98e3f13095c654bb131f7ae5
 2014-08-20 10:05:06 -07: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
Wenchao Tong
36ecb30b87 Merge "Annotate @SystemApi on some WifiManager methods." into lmp-dev 2014-08-19 02:43:23 +00:00
Wenchao Tong
4d11492071 Annotate @SystemApi on some WifiManager methods. 
Bug: 17112931
Change-Id: I5980bc46bc1f16316caecd7fcc6cd771b8ca6cdf
 2014-08-19 09:42:41 -07:00
Deepanshu Gupta
486ed3da0a Merge "Fix "@null" resource values in LayoutLib." into lmp-dev 2014-08-19 02:43:23 +00:00
Deepanshu Gupta
151b68ddc2 Fix "@null" resource values in LayoutLib. 
Bug: http://b.android.com/74072
Change-Id: Ib84906d86772ac3df2407e71ad2167797bec4542
 2014-08-19 17:16:48 -07:00
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
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
vandwalle
1575d90605 remove passpoint, except ANQP - DO NOT MERGE 
This CL is dependend on Ic3ae7269f0ca11cec6b7aea5143499e88ecc7149

Change-Id: Ic533d1820c470bf2370a92452b37515ef7458f45
 2014-08-19 01:54:41 +00:00
Dianne Hackborn
f55e9310af am 59fef76d: am 0dafd7dc: Merge "Fix issue #17114392: android.com.phone crashes - PackageManager code" into lmp-dev 
* commit '59fef76d149b05fe6886a223c36e662e6c47d41b':
  Fix issue #17114392: android.com.phone crashes - PackageManager code
 2014-08-19 01:41:19 +00:00
Ji-Hwan Lee
7a3e25d085 am ca1aebdf: am 16b1d44e: Merge "TIF: Remove session state when hardware wrapper input crashes" into lmp-dev 
* commit 'ca1aebdf0c09a47e19c0526cd54fea07cdc8454f':
  TIF: Remove session state when hardware wrapper input crashes
 2014-08-19 01:41:08 +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
178eea5547 am 900eb151: am 8c1c4875: Merge "Temporary: raise overflow limit, print all wake locks." into lmp-dev 
* commit '900eb15179fa1cbf58231715c9af3f65115631c1':
  Temporary: raise overflow limit, print all wake locks.
 2014-08-19 01:03:04 +00:00