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

103475 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kmccormick
5dee53588a am bea4797d: am da58f7f1: am d80f5809: am 7c805a0e: am 404eb8d3: am a243e162: am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs 
* commit 'bea4797dd2451047dac857f849aa22d0588853ad':
  Doc update: emulator bug fix
 2013-03-29 14:36:18 -07:00
Jatin Lodhia
278700fdb9 am 98c762bf: am ce66fd74: Merge "AccountManager changes for profile seeding." into jb-mr2-dev 
* commit '98c762bf7cd291e4ae3d9923a8feb3389855ecff':
  AccountManager changes for profile seeding.
 2013-03-29 14:36:14 -07:00
Romain Guy
addf0e96c4 am 254f8082: am 77ebbbe0: Merge "Prevent crash when a single layer is enqueued several times for updates Bug #8504687" into jb-mr2-dev 
* commit '254f80823f034da878c66eda32c604e0333cc318':
  Prevent crash when a single layer is enqueued several times for updates Bug #8504687
 2013-03-29 14:36:09 -07:00
Fabrice Di Meglio
01da3f416c am 3526196d: am 3dc52ce7: Merge "Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev 
* commit '3526196d1f405d6a42c15d3091ca3843c2002422':
  Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode
 2013-03-29 14:36:00 -07:00
Irfan Sheriff
d236406ed7 am 2b2845b0: am 964a6a7e: Merge "Scope certs for wifi UID and handle migration" into jb-mr2-dev 
* commit '2b2845b0c130a495e844ec454cb61f9d0f76899e':
  Scope certs for wifi UID and handle migration
 2013-03-29 14:35:14 -07:00
Raph Levien
172c406529 am 2adf34e3: am 76a40744: Merge "Switch indic fonts to Noto" into jb-mr2-dev 
* commit '2adf34e3899ee6f74b053ca5bb0dda291c7f2014':
  Switch indic fonts to Noto
 2013-03-29 14:34:49 -07:00
Raph Levien
85973db79d am 0a914107: am 8fed6bc8: Merge "Make zero width space a line breaker" into jb-mr2-dev 
* commit '0a914107205981a8baa079736c959ea9abedbf50':
  Make zero width space a line breaker
 2013-03-29 14:34:46 -07:00
Dianne Hackborn
c3aac10360 am d680287b: am cb5a4bf2: Merge "Apparently SystemUI no longer needs the carousel." into jb-mr2-dev 
* commit 'd680287b420dea41280a28d80eac79f780e0f7d0':
  Apparently SystemUI no longer needs the carousel.
 2013-03-29 14:34:38 -07:00
Jean-Michel Trivi
7678a7beea resolved conflicts for merge of 99bd302c to master 
Change-Id: I858f67d0c61f6403b336c82a300f69027fc16bd1
 2013-03-29 14:30:34 -07:00
kmccormick
bea4797dd2 am da58f7f1: am d80f5809: am 7c805a0e: am 404eb8d3: am a243e162: am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs 
* commit 'da58f7f1c396c71fa89d58bc2c25e6ed30cb573f':
  Doc update: emulator bug fix
 2013-03-29 13:58:57 -07:00
kmccormick
da58f7f1c3 am d80f5809: am 7c805a0e: am 404eb8d3: am a243e162: am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs 
* commit 'd80f58095b5b1358c40c9bdf50afceaaa7ce87e5':
  Doc update: emulator bug fix
 2013-03-29 13:57:22 -07:00
kmccormick
d80f58095b am 7c805a0e: am 404eb8d3: am a243e162: am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs 
* commit '7c805a0e0eb42244438c83678f103c4bb7071a4b':
  Doc update: emulator bug fix
 2013-03-29 13:56:05 -07:00
kmccormick
7c805a0e0e am 404eb8d3: am a243e162: am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs 
* commit '404eb8d36a2e6ebea3f16ad1e013423f7f1d4d13':
  Doc update: emulator bug fix
 2013-03-29 13:54:15 -07:00
kmccormick
404eb8d36a am a243e162: am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs 
* commit 'a243e162542cd4dcfc3ffd7b46b111efe402972f':
  Doc update: emulator bug fix
 2013-03-29 13:51:07 -07:00
kmccormick
a243e16254 am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs 
* commit '82a42a25e3e7dceefdca41096ce6e768f285076c':
  Doc update: emulator bug fix
 2013-03-29 13:49:31 -07:00
Jatin Lodhia
98c762bf7c am ce66fd74: Merge "AccountManager changes for profile seeding." into jb-mr2-dev 
* commit 'ce66fd747928fd1af119bcdc120bfcfb5add05b1':
  AccountManager changes for profile seeding.
 2013-03-29 13:47:38 -07:00
kmccormick
82a42a25e3 Merge "Doc update: emulator bug fix" into jb-mr1.1-docs 2013-03-29 20:47:11 +00:00
kmccormick
84cb2be8ea Doc update: emulator bug fix 
"Bug: 7990692"

Change-Id: I767c5662cebf7fe8f578190bc9730d72e97abeb1
 2013-03-29 13:45:03 -07:00
Jatin Lodhia
ce66fd7479 Merge "AccountManager changes for profile seeding." into jb-mr2-dev 2013-03-29 20:44:49 +00:00
Romain Guy
254f80823f am 77ebbbe0: Merge "Prevent crash when a single layer is enqueued several times for updates Bug #8504687" into jb-mr2-dev 
* commit '77ebbbe042dc4d5c162da5e2d3b379ebc8514fc9':
  Prevent crash when a single layer is enqueued several times for updates Bug #8504687
 2013-03-29 13:32:14 -07:00
Romain Guy
77ebbbe042 Merge "Prevent crash when a single layer is enqueued several times for updates Bug #8504687" into jb-mr2-dev 2013-03-29 20:29:11 +00:00
Fabrice Di Meglio
3526196d1f am 3dc52ce7: Merge "Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev 
* commit '3dc52ce711a6345d9f18dd31e39344792116597c':
  Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode
 2013-03-29 12:42:05 -07:00
Fabrice Di Meglio
3dc52ce711 Merge "Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev 2013-03-29 19:38:50 +00:00
Romain Guy
02b49b70ed Prevent crash when a single layer is enqueued several times for updates 
Bug #8504687

Change-Id: I9b01bbc4e3f37af23dfe5e68d3d03ad3d238b94a
 2013-03-29 12:37:16 -07:00
Irfan Sheriff
2b2845b0c1 am 964a6a7e: Merge "Scope certs for wifi UID and handle migration" into jb-mr2-dev 
* commit '964a6a7e209b0db262c827721ae5fde3f98ca763':
  Scope certs for wifi UID and handle migration
 2013-03-29 10:36:38 -07:00
Irfan Sheriff
964a6a7e20 Merge "Scope certs for wifi UID and handle migration" into jb-mr2-dev 2013-03-29 17:32:44 +00:00
Raph Levien
2adf34e389 am 76a40744: Merge "Switch indic fonts to Noto" into jb-mr2-dev 
* commit '76a407442e0567e6c658cab546c32efc92711dc0':
  Switch indic fonts to Noto
 2013-03-29 10:06:04 -07:00
Raph Levien
0a91410720 am 8fed6bc8: Merge "Make zero width space a line breaker" into jb-mr2-dev 
* commit '8fed6bc894a993a195ebcb8e8772b725cd828f0d':
  Make zero width space a line breaker
 2013-03-29 10:02:16 -07:00
Raph Levien
76a407442e Merge "Switch indic fonts to Noto" into jb-mr2-dev 2013-03-29 17:01:31 +00:00
Raph Levien
8fed6bc894 Merge "Make zero width space a line breaker" into jb-mr2-dev 2013-03-29 16:58:33 +00:00
Dianne Hackborn
d680287b42 am cb5a4bf2: Merge "Apparently SystemUI no longer needs the carousel." into jb-mr2-dev 
* commit 'cb5a4bf2ee4a2089c8dd6b71d197c63319a97ff6':
  Apparently SystemUI no longer needs the carousel.
 2013-03-29 09:57:54 -07:00
The Android Open Source Project
d3289c6083 am 3cea00ac: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit '3cea00acfa2f2e9722ad7db4b674f9f0d0f52f8d':
  Update layers to clear them Bug #8489505
  Crank up the mOomMinFreeHigh values by 50%.
  Fix an action bar menu order of operations bug
  Fix bug #8487785 Notification shade has text overlapping the icon
 2013-03-29 09:54:34 -07:00
Jean-Michel Trivi
99bd302cfe am bc43b4c2: RemoteControlClient can report current position, speed 
* commit 'bc43b4c2f24fd03c0d0546895c97918c1736d9fb':
  RemoteControlClient can report current position, speed
 2013-03-29 09:54:15 -07:00
Dianne Hackborn
cb5a4bf2ee Merge "Apparently SystemUI no longer needs the carousel." into jb-mr2-dev 2013-03-29 16:53:54 +00:00
The Android Open Source Project
3cea00acfa Reconcile with jb-mr2-release - do not merge 
Change-Id: I82cfbeb6b54a3bb1225321fb5bb9d57b6ce1d821
 2013-03-29 09:48:56 -07:00
Jean-Michel Trivi
bc43b4c2f2 RemoteControlClient can report current position, speed 
Extend RemoteControlClient class to support reporting the
 current playback position, and the playback speed.
Define listener for an application to receive new playback
 position to seek to (use of listener to be implemented).
Update IRemoteControlDisplay implementations to new interface.

bug 8120740

Change-Id: I2654daeca1ac49713d325df8226dceb85943c020
 2013-03-29 09:47:48 -07:00
Raph Levien
8d087c349f Make zero width space a line breaker 
This patch makes ZWSP (U+200B, zero width space) a potential line break
in text layouts. This is a fix for bug 8501809.

Change-Id: I18c1f8464e6c821ff75f819141bacc714a878700
 2013-03-29 09:25:48 -07:00
Victoria Lease
3395e12541 am fef08dc1: am a4b68908: Merge "bidiFlags != SkPaint::Flags" into jb-mr2-dev 
* commit 'fef08dc1c23fc3c7582e36df10d8a12acd22fb62':
  bidiFlags != SkPaint::Flags
 2013-03-29 08:59:30 -07:00
Victoria Lease
fef08dc1c2 am a4b68908: Merge "bidiFlags != SkPaint::Flags" into jb-mr2-dev 
* commit 'a4b68908bdfefdf6c79a8b2c3d7bda00c543532f':
  bidiFlags != SkPaint::Flags
 2013-03-29 08:56:04 -07:00
Victoria Lease
a4b68908bd Merge "bidiFlags != SkPaint::Flags" into jb-mr2-dev 2013-03-29 15:00:50 +00:00
Fabrice Di Meglio
618e3aafdd Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode 
- title should be "viewStart"
- link speed should be also "viewStart"

Change-Id: I8d85dd8b6850f8ae4c972dad40642c33b9004dce
 2013-03-28 20:23:23 -07:00
Lorenzo Colitti
4d25dd94aa am 742056ee: am 2fb669e6: Merge "Stop clat if it\'s no longer in use." into jb-mr2-dev 
* commit '742056ee37e94cd51390527fea835112b29c8a94':
  Stop clat if it's no longer in use.
 2013-03-28 18:25:52 -07:00
Lorenzo Colitti
742056ee37 am 2fb669e6: Merge "Stop clat if it\'s no longer in use." into jb-mr2-dev 
* commit '2fb669e68f771f07517b8d5087ca875025b9bcfb':
  Stop clat if it's no longer in use.
 2013-03-28 18:22:04 -07:00
Lorenzo Colitti
2fb669e68f Merge "Stop clat if it's no longer in use." into jb-mr2-dev 2013-03-29 01:17:45 +00:00
kmccormick
58367ad362 am 8706df1c: am 326e8bf8: am 84bba952: am 297409fe: am 3abd5a00: am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs 
* commit '8706df1cb7a3964d9a6570a795368f4a78a58cf7':
  Doc update: clarify rules for rate param
 2013-03-28 18:15:02 -07:00
kmccormick
8706df1cb7 am 326e8bf8: am 84bba952: am 297409fe: am 3abd5a00: am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs 
* commit '326e8bf8264b8b89bc3deb1faa0c98a79ca7cac1':
  Doc update: clarify rules for rate param
 2013-03-28 18:12:01 -07:00
kmccormick
326e8bf826 am 84bba952: am 297409fe: am 3abd5a00: am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs 
* commit '84bba9528c5d3baf22656746255b74e72b4555ff':
  Doc update: clarify rules for rate param
 2013-03-28 18:10:08 -07:00
kmccormick
84bba9528c am 297409fe: am 3abd5a00: am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs 
* commit '297409fefcfb2704162536562db9395903476b44':
  Doc update: clarify rules for rate param
 2013-03-28 18:07:59 -07:00
kmccormick
297409fefc am 3abd5a00: am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs 
* commit '3abd5a00ab24299de00b6dfa9c73ff59e3f3360c':
  Doc update: clarify rules for rate param
 2013-03-28 18:05:44 -07:00
kmccormick
3abd5a00ab am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs 
* commit 'ef47a8c48a29ae73e4a7a1386def8fcd10b0044c':
  Doc update: clarify rules for rate param
 2013-03-28 18:04:31 -07:00