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

149802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
0bba102d50 am 5e8e34d9: am aac20cfc: (-s ours) am 9776312a: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-modular-dev 
* commit '5e8e34d9d751d582c29fcf91c2462e6f2225fff5':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 04:44:40 +00:00
Deepanshu Gupta
4c72ba8113 am c9d0cb09: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables." into lmp-dev 
* commit 'c9d0cb09531f16c5a30337fa71aa4d7ba37a8768':
  Remove ANDROID_BUILD_TOP from intelliJ path variables.
 2014-09-04 04:43:50 +00:00
Deepanshu Gupta
e98b536d8b am 80899170: Merge "enums in dimension attributes." into lmp-dev 
* commit '8089917012e9133eb4d0ff4985c130c70d693b96':
  enums in dimension attributes.
 2014-09-04 04:39:25 +00:00
Deepanshu Gupta
a6f694dcee am 7d931c01: Merge "Null out "@null" attributes." into lmp-dev 
* commit '7d931c01e47b4b4bac658d1628e0deb64308fb67':
  Null out "@null" attributes.
 2014-09-04 04:39:20 +00:00
Deepanshu Gupta
ed7815d13b am 8fbaefb0: Merge "LayoutLib: Fix warnings in ResourceHelper." into lmp-dev 
* commit '8fbaefb017b164133ac7e4ea87772fead5396374':
  LayoutLib: Fix warnings in ResourceHelper.
 2014-09-04 04:39:16 +00:00
Deepanshu Gupta
f3803bbcca am 02c6c26d: Merge "LayoutLib: Allow \'+\' in float attributes." into lmp-dev 
* commit '02c6c26dfa188710fc748f3b0cea57122e451cbb':
  LayoutLib: Allow '+' in float attributes.
 2014-09-04 04:39:13 +00:00
Deepanshu Gupta
fda4d9a764 am 229833c3: Merge "Fix invalid conditional check." into lmp-dev 
* commit '229833c30bfae115c0691af11e531473f827c453':
  Fix invalid conditional check.
 2014-09-04 04:39:09 +00:00
Deepanshu Gupta
e1ace42429 am 2d5629df: Merge "Build layoutlib_create tests." into lmp-dev 
* commit '2d5629dff0de6262440682ff73214a7245d40c24':
  Build layoutlib_create tests.
 2014-09-04 04:39:05 +00:00
Jae Seo
76466da907 am 9c723776: Merge "TIF: Add Quebec ratings for Canada and fix the XML example" into lmp-dev 
* commit '9c723776441af73f97e5ed736d2d6ec0d0e8c2d4':
  TIF: Add Quebec ratings for Canada and fix the XML example
 2014-09-04 04:36:52 +00:00
Adam Powell
945399968d am c3070461: Merge "Change the CAB to use the up-glyph for closing action modes" into lmp-dev 
* commit 'c30704610f77b486d6c52f80b8ed36f41763448f':
  Change the CAB to use the up-glyph for closing action modes
 2014-09-04 04:34:26 +00:00
Shishir Agrawal
5a3a48ba91 am 64fb11a6: Add a config variable to control radio power cycle on SIM refresh reset. 
* commit '64fb11a66e470d0405b0523c38ce7e86785d3765':
  Add a config variable to control radio power cycle on SIM refresh reset.
 2014-09-04 04:34:21 +00:00
Deepanshu Gupta
67f8358764 am aac20cfc: (-s ours) am 9776312a: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-modular-dev 
* commit 'aac20cfcb4752a38bb27fb134869868c487d855f':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 02:49:17 +00:00
Deepanshu Gupta
aac20cfcb4 am 9776312a: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-modular-dev 
* commit '9776312a80f0072bf1d1fe8183e168f7d5879c4c':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 02:22:43 +00:00
Deepanshu Gupta
708df7bc45 Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables." into lmp-dev 2014-09-04 01:51:55 +00:00
Deepanshu Gupta
9776312a80 Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-modular-dev 2014-09-04 01:50:28 +00:00
Deepanshu Gupta
db0b8a1997 Merge "enums in dimension attributes." into lmp-dev 2014-09-04 01:48:24 +00:00
Deepanshu Gupta
351ed32961 Merge "Null out "@null" attributes." into lmp-dev 2014-09-04 01:48:14 +00:00
Deepanshu Gupta
bcbe8fcdb1 Merge "LayoutLib: Fix warnings in ResourceHelper." into lmp-dev 2014-09-04 01:46:58 +00:00
Deepanshu Gupta
a7c2419ec9 Merge "LayoutLib: Allow '+' in float attributes." into lmp-dev 2014-09-04 01:46:42 +00:00
Deepanshu Gupta
d75edc41a6 Merge "Fix invalid conditional check." into lmp-dev 2014-09-04 01:46:14 +00:00
Deepanshu Gupta
8a2ff1ecd9 Merge "Build layoutlib_create tests." into lmp-dev 2014-09-04 01:45:36 +00:00
Jae Seo
a90ae8bebb Merge "TIF: Add Quebec ratings for Canada and fix the XML example" into lmp-dev 2014-09-04 01:23:35 +00:00
Adam Powell
4ef16eaa8d Merge "Change the CAB to use the up-glyph for closing action modes" into lmp-dev 2014-09-04 01:18:14 +00:00
Shishir Agrawal
3bdda955a1 Add a config variable to control radio power cycle on SIM refresh reset. 
This was required for legacy devices and causes issues in the newer devices.

Bug: 17154939
Change-Id: Ib231975d3210a8c4f3f10ac3af1b636e3de5fcbf
 2014-09-03 17:59:16 -07:00
John Reck
f2bd737b41 am 73339a99: Fix some wrong-thread issues around animator management 
* commit '73339a99a97570d8000ef03560c4fb5346b46a3d':
  Fix some wrong-thread issues around animator management
 2014-09-04 00:50:23 +00:00
Scott Rowe
57aa172521 am 4a7fd3ad: am 14f413be: am 048d8baa: am 0ccf80c3: Merge "docs: b/15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs 
* commit '4a7fd3ad0ef613a59d4cb3f766deabe02d5ef9c5':
  docs: b/15790433 updated for xxhdpi and xxxhdpi
 2014-09-04 00:50:12 +00:00
Jungshik Jang
0652381b43 am 5957c55c: Merge "Rename ro.config.music_vol_steps into ro.config.media_vol_steps." into lmp-dev 
* commit '5957c55c12ed54941ddcd8bd20d64c0466951424':
  Rename ro.config.music_vol_steps into ro.config.media_vol_steps.
 2014-09-04 00:50:08 +00:00
Svetoslav
d81c0d2b0d am d370dcc7: Merge "Clear binder identity when sending window change accessibility events." into lmp-dev 
* commit 'd370dcc75d9319635ddf5b3a97cf483b12bb146f':
  Clear binder identity when sending window change accessibility events.
 2014-09-04 00:50:04 +00:00
Ricardo Cervera
820ea660e1 am 44707d95: am 17aec620: am 15abafe2: am c0393e7f: Merge "docs: Docs for Android project view. Bug: 17108468" into klp-modular-docs 
* commit '44707d95181b9225fd7e7c8d2da173990fa14ec2':
  docs: Docs for Android project view. Bug: 17108468
 2014-09-04 00:49:59 +00:00
Alan Viverette
42150bc8b3 am 1d53feb9: Merge "Only use default backgrounds when not extending AlertDialog style" into lmp-dev 
* commit '1d53feb96f775c0542fecff0a2d36a6b6e45dbaa':
  Only use default backgrounds when not extending AlertDialog style
 2014-09-04 00:49:55 +00:00
Wink Saville
34f1382d69 am f8773dfb: Merge "Add PhoneStateListener(Looper looper) and some documentation." into lmp-dev 
* commit 'f8773dfbbc84b52f308f61d75ae2a028773dc749':
  Add PhoneStateListener(Looper looper) and some documentation.
 2014-09-04 00:49:49 +00:00
Wink Saville
343feb7019 Merge commit '3432c20c' into fix-merge-conflict 
* commit '3432c20c':
  Hide SubscriptionManager using individual @hide on fields and methods.

Conflicts:
	telephony/java/android/telephony/SubscriptionManager.java

Change-Id: Ic8d528b7a046f0b2a9735ba62720de142952d7ef
 2014-09-03 17:38:28 -07:00
John Reck
e2478d45cc Fix some wrong-thread issues around animator management 
Bug: 17372309

 Fixes a case where UI thread and RT thread both used the same method
 which wasn't safe for either of them.

 Adds additional assertions & logging in unusual circumstances to
 try and track down where the issue is occuring from.

Change-Id: I93d31a6fd0c5927259b67bdf96a475944226eee6
 2014-09-03 17:37:59 -07:00
Scott Rowe
3215da25dd am 14f413be: am 048d8baa: am 0ccf80c3: Merge "docs: b/15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs 
* commit '14f413be3c7701750b996b90c95471e8cf04ae96':
  docs: b/15790433 updated for xxhdpi and xxxhdpi
 2014-09-04 00:20:15 +00:00
Adam Powell
b2536cf473 Change the CAB to use the up-glyph for closing action modes 
In an effort to reduce glyph proliferation, change the "done"
checkmark from the CAB to the up-navigation arrow, placing the CAB
firmly in the current navigation hierarchy. This matches behavior for
expandable action views such as SearchView.

Allow the use of different CAB "done" layouts by theme; the material
layout should not include the "done" text and should use the standard
borderless selectable item background.

Bug 17372188

Change-Id: Icfb3e0bbc6a718e22ab27f9d520da5fe4eb833e7
 2014-09-03 17:17:45 -07:00
Jungshik Jang
329a406ed9 Merge "Rename ro.config.music_vol_steps into ro.config.media_vol_steps." into lmp-dev 2014-09-04 00:13:42 +00:00
Scott Rowe
14f413be3c am 048d8baa: am 0ccf80c3: Merge "docs: b/15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs 
* commit '048d8baaffadc28ee8e7bab0ce61a868c09c311a':
  docs: b/15790433 updated for xxhdpi and xxxhdpi
 2014-09-04 00:13:02 +00:00
Svetoslav
a8d26e80bd Merge "Clear binder identity when sending window change accessibility events." into lmp-dev 2014-09-04 00:03:44 +00:00
Scott Rowe
048d8baaff am 0ccf80c3: Merge "docs: b/15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs 
* commit '0ccf80c31dbf236ec8ffafc8c72f036c3137bc5a':
  docs: b/15790433 updated for xxhdpi and xxxhdpi
 2014-09-03 23:58:25 +00:00
Scott Rowe
0ccf80c31d Merge "docs: b/15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs 2014-09-03 23:52:13 +00:00
Ricardo Cervera
366390ce9f am 17aec620: am 15abafe2: am c0393e7f: Merge "docs: Docs for Android project view. Bug: 17108468" into klp-modular-docs 
* commit '17aec62001a60c191c21d7cbf34ecd9d2f2683bd':
  docs: Docs for Android project view. Bug: 17108468
 2014-09-03 23:47:48 +00:00
Joe Fernandez
1b7cc0d269 am 5f129a96: am a1a3c8a1: am 9de22952: am ab833be6: Merge "docs: Fix bug with Accessibility Services dev guide" into klp-modular-docs 
* commit '5f129a96befdf13c35944badaf94902a96b316c8':
  docs: Fix bug with Accessibility Services dev guide
 2014-09-03 23:43:08 +00:00
Svet Ganov
6b30550019 am 26aa29dd: Merge "Switching to raw byte copy of bitmaps for print preview." into lmp-dev 
* commit '26aa29ddc7c818ff1272b687aeb2412701155bf3':
  Switching to raw byte copy of bitmaps for print preview.
 2014-09-03 23:43:04 +00:00
Christopher Tate
ed7f474734 am e4f0d1c4: Merge "Fix crash in KeySet dump" into lmp-dev 
* commit 'e4f0d1c46bcc7eac0bb637677a83a5b6a041e63c':
  Fix crash in KeySet dump
 2014-09-03 23:43:01 +00:00
Alan Viverette
98a31b2ef0 Merge "Only use default backgrounds when not extending AlertDialog style" into lmp-dev 2014-09-03 23:42:42 +00:00
Jae Seo
0a514c0a87 TIF: Add Quebec ratings for Canada and fix the XML example 
Bug: 17332911, Bug: 17321648
Change-Id: Ice884ecdeda246e978ab235913e3e92d0c1e6ec2
 2014-09-03 16:42:39 -07:00
Ricardo Cervera
17aec62001 am 15abafe2: am c0393e7f: Merge "docs: Docs for Android project view. Bug: 17108468" into klp-modular-docs 
* commit '15abafe2c0bbe034a63162ff409922225f55aed9':
  docs: Docs for Android project view. Bug: 17108468
 2014-09-03 23:37:46 +00:00
Wink Saville
cf39f86b50 Merge "Add PhoneStateListener(Looper looper) and some documentation." into lmp-dev 2014-09-03 23:37:17 +00:00
Wink Saville
c02154f862 Merge "Hide SubscriptionManager using individual @hide on fields and methods." into lmp-dev 2014-09-03 23:37:06 +00:00
Joe Fernandez
14a5d2bd4d am a1a3c8a1: am 9de22952: am ab833be6: Merge "docs: Fix bug with Accessibility Services dev guide" into klp-modular-docs 
* commit 'a1a3c8a126032596b722d9faa74c616a4a8974e7':
  docs: Fix bug with Accessibility Services dev guide
 2014-09-03 23:36:30 +00:00