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

211405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Kralevich
f6f98daf54 am ebdc7caa: am f3ae2603: am 10e0f079: Merge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin." 
* commit 'ebdc7caac07f35802e1d3635fe55c98983774d49':
  SELinuxPolicyInstallReceiver:  Switch to file_contexts.bin.
 2015-08-13 00:46:29 +00:00
Nick Kralevich
ebdc7caac0 am f3ae2603: am 10e0f079: Merge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin." 
* commit 'f3ae260367235e325adce10c9aadddfe8a3107c1':
  SELinuxPolicyInstallReceiver:  Switch to file_contexts.bin.
 2015-08-13 00:40:25 +00:00
Jeff Sharkey
7619dba79e am 59a18530: am b4ac3781: am d913d78a: am ea68c4ce: am c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev 
* commit '59a18530f5fc0152b7a7609bd2ed2128fa8e7fc7':
  Update ifaces when global restriction changes.
 2015-08-13 00:33:35 +00:00
Jeff Sharkey
59a18530f5 am b4ac3781: am d913d78a: am ea68c4ce: am c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev 
* commit 'b4ac37818efa6ea81902f8b2631260b5b1b0ce78':
  Update ifaces when global restriction changes.
 2015-08-13 00:27:23 +00:00
Deepanshu Gupta
8d38e7c905 Merge "Add StyleableRes annotation to TypedArray." 2015-08-13 00:25:54 +00:00
Jeff Sharkey
b4ac37818e am d913d78a: am ea68c4ce: am c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev 
* commit 'd913d78a331de5e488b27810d8dd18399f50de48':
  Update ifaces when global restriction changes.
 2015-08-13 00:19:46 +00:00
Jeff Sharkey
d913d78a33 am ea68c4ce: am c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev 
* commit 'ea68c4ceacbe235c4d8688437010d855ef02e1fb':
  Update ifaces when global restriction changes.
 2015-08-13 00:11:49 +00:00
Jeff Sharkey
ea68c4ceac am c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev 
* commit 'c97509c0292910d7fb27e4c890ad4bc0ea723fec':
  Update ifaces when global restriction changes.
 2015-08-13 00:00:13 +00:00
Nick Kralevich
f3ae260367 am 10e0f079: Merge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin." 
* commit '10e0f07975e6e446763b733bb438df5715c3693d':
  SELinuxPolicyInstallReceiver:  Switch to file_contexts.bin.
 2015-08-12 23:57:58 +00:00
Roshan Pius
474ee117e8 am c01093cc: am b40108fb: am 289ecbbf: am 737aed41: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev 
* commit 'c01093cc9b414f90b2f400cd196d631b38bd6d0f':
  Add a new carrier config for DTMF tone gap.
 2015-08-12 23:56:29 +00:00
Elliott Hughes
4c807349bd am 344d347a: am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base." 
* commit '344d347af22705aa2fa80602d27a5682a72b5f69':
  Lose HAVE_ANDROID_OS from frameworks/base.
 2015-08-12 23:56:18 +00:00
Jeff Sharkey
c97509c029 Merge "Update ifaces when global restriction changes." into mnc-dev 2015-08-12 23:51:55 +00:00
Nick Kralevich
10e0f07975 Merge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin." 2015-08-12 23:46:28 +00:00
Jeff Sharkey
9d14206594 Update ifaces when global restriction changes. 
Global restriction of background data only applies to metered
interfaces, but battery saver applies to all interfaces.  In the
very specific case where global background had been turned on while
battery saver was enabled, we'd end up with a stale battery saver
rule floating around.

This change triggers an update of iface rules when the global
restriction changes, giving us consistent behavior.

Bug: 23098198
Change-Id: I454dc71cf11d50a2e9e6122e8a801ff17039b43a
 2015-08-12 16:46:05 -07:00
Roshan Pius
c01093cc9b am b40108fb: am 289ecbbf: am 737aed41: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev 
* commit 'b40108fb85fc11f636424ebf9154bdfbc56764a0':
  Add a new carrier config for DTMF tone gap.
 2015-08-12 23:36:14 +00:00
Elliott Hughes
344d347af2 am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base." 
* commit '39669d7f6b8fedef3468ab3d417c93a21df528af':
  Lose HAVE_ANDROID_OS from frameworks/base.
 2015-08-12 23:28:30 +00:00
Roshan Pius
b40108fb85 am 289ecbbf: am 737aed41: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev 
* commit '289ecbbfafbb73ccf00e14ea8e2f6584406b50fe':
  Add a new carrier config for DTMF tone gap.
 2015-08-12 23:25:22 +00:00
Roshan Pius
289ecbbfaf am 737aed41: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev 
* commit '737aed41ca9d8bad425ed8223fa4e4c84c7b102c':
  Add a new carrier config for DTMF tone gap.
 2015-08-12 23:17:27 +00:00
Roshan Pius
737aed41ca Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev 2015-08-12 23:12:24 +00:00
Elliott Hughes
39669d7f6b am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base." 
* commit '6fdc633380bb4744595575449101ee171b690175':
  Lose HAVE_ANDROID_OS from frameworks/base.
 2015-08-12 22:31:01 +00:00
Elliott Hughes
6fdc633380 Merge "Lose HAVE_ANDROID_OS from frameworks/base." 2015-08-12 22:21:46 +00:00
Elliott Hughes
ba3fe56edc Lose HAVE_ANDROID_OS from frameworks/base. 
Change-Id: I713881fdbaec7cbbb5e7f2f4be6f9b8be3d2ca4e
 2015-08-12 14:49:53 -07:00
Raph Levien
8cf6d865cf am d202d15d: am cf2d44be: am 855a862f: am c98a786c: am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev 
* commit 'd202d15d9e4845537c4409c9880eb269b2b59129':
  Fix Insertion ActionMode not showing on RTL languages
 2015-08-12 21:40:58 +00:00
Raph Levien
d202d15d9e am cf2d44be: am 855a862f: am c98a786c: am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev 
* commit 'cf2d44bee50dc2950181bbf5974c32eacea6f0a7':
  Fix Insertion ActionMode not showing on RTL languages
 2015-08-12 21:31:07 +00:00
Raph Levien
cf2d44bee5 am 855a862f: am c98a786c: am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev 
* commit '855a862f6d1ef1af1b16c21d67645b5141db94fc':
  Fix Insertion ActionMode not showing on RTL languages
 2015-08-12 21:22:46 +00:00
Raph Levien
855a862f6d am c98a786c: am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev 
* commit 'c98a786c693bf0bb617348e858ffe720db4d96d8':
  Fix Insertion ActionMode not showing on RTL languages
 2015-08-12 21:13:32 +00:00
Raph Levien
c98a786c69 am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev 
* commit 'beabcb92cbdec6f68bd712c9972e6f8377b78f46':
  Fix Insertion ActionMode not showing on RTL languages
 2015-08-12 21:07:43 +00:00
Roshan Pius
9f81ce727c Add a new carrier config for DTMF tone gap. 
Adding a new carrier config key to specify the gap between the DTMF
tones sent out to the network.

BUG: 23064351
Change-Id: I3a0e20efecd62f533e796a40097f181d4c20d614
 2015-08-12 21:04:26 +00:00
Martijn Coenen
a372531a6b Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-08-12 21:03:26 +00:00
John Reck
106452119b Merge "Fix bug in calculating perspective damage" 2015-08-12 21:02:56 +00:00
Eino-Ville Talvala
b92e3968b0 am 159a16ab: am f21ecd03: am 6986410a: am 5679800f: am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev 
* commit '159a16ab79588d71aee5a10b1a4cd4a7f360ed9d':
  Camera: Fix framework bugs with DEPTH-only camera devices
 2015-08-12 21:02:52 +00:00
Raph Levien
beabcb92cb Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev 2015-08-12 21:00:07 +00:00
Alan Viverette
00cdbce6c3 Merge "Clear check mark resource ID when set from Drawable object" 2015-08-12 20:59:44 +00:00
Eino-Ville Talvala
159a16ab79 am f21ecd03: am 6986410a: am 5679800f: am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev 
* commit 'f21ecd037e7d17626416e3247b83ab93d81d2559':
  Camera: Fix framework bugs with DEPTH-only camera devices
 2015-08-12 20:53:52 +00:00
John Reck
c128823940 Fix bug in calculating perspective damage 
Change-Id: Iacab98cf3525f891012087acf85e4205b5e8f0d0
 2015-08-12 13:52:01 -07:00
Eino-Ville Talvala
f21ecd037e am 6986410a: am 5679800f: am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev 
* commit '6986410a598fd214cdcbd684c236d071a198c075':
  Camera: Fix framework bugs with DEPTH-only camera devices
 2015-08-12 20:41:55 +00:00
Jason Monk
3111d4e17a Merge "Add Preference#onDetachedFromActivity" 2015-08-12 20:41:41 +00:00
Eino-Ville Talvala
6986410a59 am 5679800f: am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev 
* commit '5679800f382918bb3ca159997609fc551f2a739a':
  Camera: Fix framework bugs with DEPTH-only camera devices
 2015-08-12 20:32:53 +00:00
Alan Viverette
c60feca6a9 Clear check mark resource ID when set from Drawable object 
Bug: 22626247
Change-Id: Ia32bc19512442fdf0d2c091d63a61f992545f2c2
 2015-08-12 16:26:37 -04:00
Eino-Ville Talvala
5679800f38 am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev 
* commit '242ff8a89d851cc5c53b11dadd871fa55e00fbb5':
  Camera: Fix framework bugs with DEPTH-only camera devices
 2015-08-12 20:18:46 +00:00
Alan Viverette
0525882463 Merge "Remove disabled alpha adjustment from SeekBar track" 2015-08-12 20:16:01 +00:00
Clara Bayarri
f95ed10d9d Fix Insertion ActionMode not showing on RTL languages 
When long pressing on an empty Text field with the system language set
to RTL, the "paste" popup was not showing up.

The Floating Toolbar requires a content rect to determine where the
text is and place itself close to it. In the case of an empty field,
we create a "fake" content rect by taking the placement of the cursor
+1 pixel to the right. In RTL languages, this +1 causes the content
rect to be considered off the bounds of the view, as the cursor is
aligned to the right, and hence the Floating Toolbar is hidden.

After making the rect a 0 width rect, we ran into the issue that
it was considered out of bounds due to the calculation ignoring rects
that simply touch the edge of the view's bounds.

BUG: 22540083
Change-Id: I29c79b701f586970b2611178233eff082b802ec1
 2015-08-12 21:03:28 +01:00
Eino-Ville Talvala
242ff8a89d Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev 2015-08-12 20:01:44 +00:00
Alan Viverette
3f97db2fc3 Remove disabled alpha adjustment from SeekBar track 
Bug: 21933285
Change-Id: Ifdf951dc7505c3f340fbc7775225f07d96aacb0c
 2015-08-12 15:56:45 -04:00
Mike Dodd
9f6902f014 am 88c26d46: am 4a6b0c93: am 79fdfecb: am 954ca10e: am ad285c16: Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."" into mnc-dev 
* commit '88c26d46fb181eea8ca99b1f76d2dfb38c0a268e':
  Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."
 2015-08-12 19:49:03 +00:00
Adrian Roos
96165f4396 am e77660d7: am ea73528c: am afdfc2c0: am 192ca56d: am c0a4883d: Merge "Prevent overlap of color views in landscape" into mnc-dev 
* commit 'e77660d7f4e261f21e9d8d2098c451d55ccbc533':
  Prevent overlap of color views in landscape
 2015-08-12 19:48:49 +00:00
Alan Viverette
83109d6607 Merge "Add change type to ExploreByTouchHelper" 2015-08-12 19:46:56 +00:00
Jason Monk
e18dc50c63 Add Preference#onDetachedFromActivity 
Change-Id: I7c78f96d41b33b902e54fe1c0b7246d555aab0ed
 2015-08-12 15:27:51 -04:00
Alan Viverette
961cdbf10f Add change type to ExploreByTouchHelper 
Bug: 22095062
Change-Id: I9816af56f03f2b8551642ef202a0465dee00ec15
 2015-08-12 15:22:01 -04:00
Mike Dodd
88c26d46fb am 4a6b0c93: am 79fdfecb: am 954ca10e: am ad285c16: Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."" into mnc-dev 
* commit '4a6b0c93f8ca7e78a332696043be3b73563ea037':
  Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."
 2015-08-12 19:18:23 +00:00