Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,719 Commits 3 Branches 0 Tags
b19f313e259eea7f10753cf69f10950ec45155ca
Commit Graph

25448 Commits

Author SHA1 Message Date
Victoria Lease
b19f313e25 am 976ed471: am d6991106: Merge "Avert crash when dragging text in same TextView" into jb-mr1-dev 
* commit '976ed4711ef5fc943ad94a8cbb251cd5feb34cde':
  Avert crash when dragging text in same TextView
 2012-09-17 15:12:05 -07:00
Victoria Lease
d6991106b0 Merge "Avert crash when dragging text in same TextView" into jb-mr1-dev 2012-09-17 15:08:07 -07:00
Elliott Hughes
af73eb8526 am 45b09c00: am 7134ef60: Merge "Fix date formatting for fa locales." into jb-mr1-dev 
* commit '45b09c0044893e9b549de0eeb20a925a8549cd52':
  Fix date formatting for fa locales.
 2012-09-17 14:55:09 -07:00
Adam Powell
3e8190d913 am 3987a032: am e01538f2: Merge "TaskStackBuilder - use the correct package for looking up parents" into jb-mr1-dev 
* commit '3987a03261785cbbca92f247635708d23c84ff5c':
  TaskStackBuilder - use the correct package for looking up parents
 2012-09-17 14:54:28 -07:00
Chet Haase
9c16ed747a am ee6113a6: am f74d2f2f: Merge "Fix occasional crash bug with layers" into jb-mr1-dev 
* commit 'ee6113a62099e079df9ffa1b173feb728d08c191':
  Fix occasional crash bug with layers
 2012-09-17 14:54:15 -07:00
Amith Yamasani
4a1e7e3c59 am 83385ecc: am e645324e: Merge "Add UserManager.getUserIcon()" into jb-mr1-dev 
* commit '83385eccc5274443d90d4c4dc821e6281fee4af6':
  Add UserManager.getUserIcon()
 2012-09-17 14:54:05 -07:00
Eino-Ville Talvala
c5eb2b5d90 am 978f5c6a: am b181909e: Merge "Camera: Document face detection confidence recommendations." into jb-mr1-dev 
* commit '978f5c6a2c3c6088ff77fbe84fbf3976b631346b':
  Camera: Document face detection confidence recommendations.
 2012-09-17 14:52:49 -07:00
Eric Laurent
1eb6f0f84b am 0d2c4fb0: am 39a37c3b: Merge "headphone volume limitation" into jb-mr1-dev 
* commit '0d2c4fb08a8225909295c10602c83f63aa155f95':
  headphone volume limitation
 2012-09-17 14:46:28 -07:00
Dianne Hackborn
00c4b0c015 am 86fa4926: am 8406d05b: Merge "New uninstall option to uninstall for all users." into jb-mr1-dev 
* commit '86fa49265e8df22e444e36717a956a3470352e7b':
  New uninstall option to uninstall for all users.
 2012-09-17 14:45:58 -07:00
Elliott Hughes
7134ef60b7 Merge "Fix date formatting for fa locales." into jb-mr1-dev 2012-09-17 14:45:42 -07:00
Dianne Hackborn
0ab7308e99 am 831f31c3: am b137c806: Merge "More adjustments to permissions." into jb-mr1-dev 
* commit '831f31c3883899eb57f28360bb51192937124081':
  More adjustments to permissions.
 2012-09-17 14:45:40 -07:00
rich cannings
8e58987e35 am 2357a77b: am 42af7518: Merge "Add setting to change verifier visibility" into jb-mr1-dev 
* commit '2357a77bf50413c8eb7f576a8b757b394e440edf':
  Add setting to change verifier visibility
 2012-09-17 14:45:16 -07:00
Adam Powell
67f3a40cc3 am bf78fc2a: am 89e68d78: Merge "Create main activity intents as needed for TaskStackBuilder/Up nav" into jb-mr1-dev 
* commit 'bf78fc2abfc15643f72ceb0f270e01ef900fb56f':
  Create main activity intents as needed for TaskStackBuilder/Up nav
 2012-09-17 14:45:10 -07:00
John Huang
6d30ca0163 am 45c5089a: am 4505a43f: Merge "Add support for per-package policy for sending premium SMS." into jb-mr1-dev 
* commit '45c5089ab572155d1b0694c5f909072cbc29ad74':
  Add support for per-package policy for sending premium SMS.
 2012-09-17 14:44:50 -07:00
Adam Powell
45ada3ac78 am 45937740: am b1861c3e: Minor fixes/clarifications for previous patch. 
* commit '4593774015ada7fb92f846fced136e487cd1e522':
  Minor fixes/clarifications for previous patch.
 2012-09-17 14:44:34 -07:00
Adam Powell
c86dae2337 am 3b6dc021: am 7db4eec5: Merge "Squish!" into jb-mr1-dev 
* commit '3b6dc021de2d19c021058df5af4fb8a05613d113':
  Squish!
 2012-09-17 14:44:26 -07:00
Dianne Hackborn
397c1d8467 am 0fd909ba: am d65afc65: Merge "More multi-user stuff." into jb-mr1-dev 
* commit '0fd909bad1151cc39061abb52ae5b8be090e05dd':
  More multi-user stuff.
 2012-09-17 14:44:10 -07:00
Jeff Sharkey
40210f98ba am 06f01326: am d0c6ccba: Move NetworkPolicy from apps to UID. 
* commit '06f01326dfd9e2ee557fd817481081bc3f36e35e':
  Move NetworkPolicy from apps to UID.
 2012-09-17 14:43:36 -07:00
Adam Powell
e01538f28b Merge "TaskStackBuilder - use the correct package for looking up parents" into jb-mr1-dev 2012-09-17 13:54:31 -07:00
Adam Powell
6b6c90523e TaskStackBuilder - use the correct package for looking up parents 
Fix bug 7179104

Change-Id: Ia5d2d285cf22e97c452e0c385ef38c8bce330491
 2012-09-17 13:32:33 -07:00
Chet Haase
f74d2f2fe8 Merge "Fix occasional crash bug with layers" into jb-mr1-dev 2012-09-17 13:29:03 -07:00
Christopher Tate
5067ea3751 am 5bae602c: am 2892dfbe: Merge "Fix default population of wifi settings" into jb-mr1-dev 
* commit '5bae602cbbb96af3290d430ab25600149d4d073d':
  Fix default population of wifi settings
 2012-09-17 12:47:03 -07:00
Geremy Condra
393760861d am 81953a34: am 74a550fa: Merge "Change verifyServerDomainAndCertificates to pass in a hostname." into jb-mr1-dev 
* commit '81953a3437c3af24dfb53cc7c106147d9a89be1f':
  Change verifyServerDomainAndCertificates to pass in a hostname.
 2012-09-17 12:46:56 -07:00
Kenny Root
24499c9e50 am 049005e3: am 1c9894aa: Merge "Remove AndroidKeyStore from API" into jb-mr1-dev 
* commit '049005e3c55b5f5dfda1c69482c6104d5931a2fc':
  Remove AndroidKeyStore from API
 2012-09-17 12:46:13 -07:00
Elliott Hughes
7850a41871 am 42e7af25: am 9ceede6d: am 086676a4: am f5437ee8: am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use." 
* commit '42e7af25c06e2d1dbf8201d1ff1528311cf8c44e':
  Deprecate those parts of DateUtils the documentation says not to use.
 2012-09-17 12:45:47 -07:00
rich cannings
ecfc9d8253 am d063b14d: am 0b62fa23: Merge "Send more information to verifiers" into jb-mr1-dev 
* commit 'd063b14dc8ef3cdf63d658b5375bf84b5cb1dc02':
  Send more information to verifiers
 2012-09-17 12:45:31 -07:00
Svetoslav Ganov
664222b066 am acbea737: am 3efa8bab: Merge "Adding accessibility events for touch and gesture detection states." into jb-mr1-dev 
* commit 'acbea737ec97f0fd15f2818196495b2355094065':
  Adding accessibility events for touch and gesture detection states.
 2012-09-17 12:45:14 -07:00
Amith Yamasani
3b49f07a45 Add UserManager.getUserIcon() 
So that we don't abuse the setUserIcon() for reading. So the new method won't try
to create the file, only return it if it exists.

Change-Id: I7a81d3f1b29d14d37e71f531744ce39f21d827ac
 2012-09-17 12:42:00 -07:00
Jatin Lodhia
dbef28ab73 am 4dc67287: am 836033d6: Merge "Update account list on account picker activity resume" into jb-mr1-dev 
* commit '4dc67287774495e192193e888fae6603ed85c4be':
  Update account list on account picker activity resume
 2012-09-17 11:29:54 -07:00
Kristian Monsen
7f52de24d6 am 7b1be537: am 4cb846b8: Merge "Hiding some of the deprecated android.webkit API\'s" into jb-mr1-dev 
* commit '7b1be537546481c6687efd03c3c709b266502abf':
  Hiding some of the deprecated android.webkit API's
 2012-09-17 11:29:20 -07:00
Chet Haase
603f6de35f Fix occasional crash bug with layers 
Launcher occasionally crashes with a stack trace indicating that the memory
of a Layer object is corrupt. It is possible for us to delete a Layer
structure and then, briefly, use it to draw a DisplayList again before
that DisplayList gets recreated (without the layer that got deleted).

When this happens, if the memory got corrupted, it's possible to crash.

The fix is to add Layer to the other objects which we currently refcount
(bitmaps, shaders, etc.). Then instead of deleting a Layer, we decrement the
refcount. We increment when creating it, then increment it again when it's
referenced from a DisplayList. Then we decrement the refcount instead of
deleting it, and decrement when we clear a DisplayList that refers to it.
Then when the refcount reaches 0, we delete it.

Issue #6994632 Native crash in launcher when trying to launch all apps screen

Change-Id: I0627be8d49bb2f9ba8d158a84b764bb4e7df934c
 2012-09-17 11:21:34 -07:00
Elliott Hughes
34de3bc309 Fix date formatting for fa locales. 
This adds support for standalone months (L versus M) and localized
digits.

Bug: 6811327
Change-Id: I4687a4c67605c31b155c0b8d44b3da6ed378fc82
 2012-09-17 11:17:10 -07:00
Jeff Sharkey
67bbcd036a am 1e364aca: am 04a34b37: Merge "Actually move to Global settings." into jb-mr1-dev 
* commit '1e364acac6f4768672deb73485e93c32929e25fd':
  Actually move to Global settings.
 2012-09-17 11:10:16 -07:00
Jeff Sharkey
ddf93f9503 am 892bf6c6: am a043c2c0: Merge "Move to Global.NETSTATS and Global.NTP constants." into jb-mr1-dev 
* commit '892bf6c607127ae8405fd589ae70023e457844f5':
  Move to Global.NETSTATS and Global.NTP constants.
 2012-09-17 11:10:05 -07:00
Jim Miller
391513a0a8 am e98aef73: am f229e4d3: Add support for settings for lock widgets 
* commit 'e98aef734657cc129143a4a25ee78ade48d34037':
  Add support for settings for lock widgets
 2012-09-17 11:09:55 -07:00
Michael Jurka
5a8deb16b9 am 5f76482f: am 95a2ff7c: Merge "Adding a couple extras keys for keyguard widget selection" into jb-mr1-dev 
* commit '5f76482f46139809dda13e01ec81ca87ca0803d7':
  Adding a couple extras keys for keyguard widget selection
 2012-09-17 11:09:34 -07:00
Svetoslav Ganov
55ab5105d4 am 71e3cb14: am e136a728: Merge "Text layout in switch may be null when accessibility events are fired." into jb-mr1-dev 
* commit '71e3cb143b6eb6052bb6820bf551a1d74e19ee8d':
  Text layout in switch may be null when accessibility events are fired.
 2012-09-17 11:09:16 -07:00
Christopher Tate
ed1c549a7d am 45b2dce9: am 0dbc4108: Merge "Fix Settings writes to a different user" into jb-mr1-dev 
* commit '45b2dce9822caefe69f3f680f9e60f076f9e2eaf':
  Fix Settings writes to a different user
 2012-09-17 11:09:11 -07:00
Eino-Ville Talvala
b181909eef Merge "Camera: Document face detection confidence recommendations." into jb-mr1-dev 2012-09-17 08:37:44 -07:00
Eric Laurent
39a37c3bb3 Merge "headphone volume limitation" into jb-mr1-dev 2012-09-17 08:16:01 -07:00
Dianne Hackborn
6d235d8265 New uninstall option to uninstall for all users. 
Change-Id: Ie8eb59564078069633a89fc8a92d4f8531baa1aa
 2012-09-16 18:25:40 -07:00
Eric Laurent
c34dcc1e1e headphone volume limitation 
Limit music volume when headphones or headset are inserted.
Display warning message when user wants to increase the volume
above a platform specific volume and request user acknowledgement
before proceeding.

TODO: exact wording of the warning message must be defined by UX.

Change-Id: I00f429f602534c6d8783126b929371c4d432e6e2
 2012-09-16 17:44:45 -07:00
Dianne Hackborn
b137c8065d Merge "More adjustments to permissions." into jb-mr1-dev 2012-09-16 16:42:43 -07:00
Dianne Hackborn
2ca2c87871 More adjustments to permissions. 
- New "cost money" flag can be put on a permission to
  have this emphasized in the UI.
- Some further re-organization of permissions to better
  match UX spec.

Change-Id: I450ac739eff6b90e7c7fc39589d68db82b61f897
 2012-09-16 16:41:27 -07:00
rich cannings
42af7518f5 Merge "Add setting to change verifier visibility" into jb-mr1-dev 2012-09-16 15:48:23 -07:00
Adam Powell
89e68d783b Merge "Create main activity intents as needed for TaskStackBuilder/Up nav" into jb-mr1-dev 2012-09-16 15:46:58 -07:00
Adam Powell
5a4010c054 Create main activity intents as needed for TaskStackBuilder/Up nav 
If a generated parent intent targets an Activity that itself has no
parent specified, generate the intent using Intent.makeMainActivity
to gather the correct flags for the root intent of a task.

Bug 6457058

Change-Id: I8d4a3823eda752306da18c2c38fa7e57f0a33bf3
 2012-09-16 15:15:46 -07:00
John Huang
4505a43f30 Merge "Add support for per-package policy for sending premium SMS." into jb-mr1-dev 2012-09-16 14:31:16 -07:00
rich cannings
e6686b3e23 Add setting to change verifier visibility 
Added a setting that will be used to control whether the user can see the
package verification setting in the Setting app.

Bug: 7022814
Change-Id: Ifa096682e90c83760df5db12c4cf72e2f897db9c
 2012-09-16 14:02:20 -07:00
Adam Powell
b1861c3e89 Minor fixes/clarifications for previous patch. 
Change-Id: Ib44f6de570064b3f3ddf70b6727b479a09ae5d7a
 2012-09-16 12:17:53 -07:00