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

27513 Commits

Author SHA1 Message Date
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
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
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
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
Amith Yamasani
0db31ec77d am 3e4ef8e2: am a87826c3: Merge "Fix face unlock for multiple users" into jb-mr1-dev 
* commit '3e4ef8e22010f2ede5d822ce3aaa07254079e123':
  Fix face unlock for multiple users
 2012-09-17 11:29:28 -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
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
Dianne Hackborn
6d235d8265 New uninstall option to uninstall for all users. 
Change-Id: Ie8eb59564078069633a89fc8a92d4f8531baa1aa
 2012-09-16 18:25:40 -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
Adam Powell
828e56ea6e Squish! 
Take touch point size into account during the detection of scaling
gestures. Average together the major/minor axes of the size.

Add a config resource for tuning the minimum span requred to begin
(or end) a scale. This may be altered in a device-specific overlay
for devices that deviate too far from their assigned density bucket.

Change-Id: I2986888e9427a7e4cb56717d59c4fa7858ba9ca7
 2012-09-16 10:27:03 -07:00
Dianne Hackborn
d65afc65ea Merge "More multi-user stuff." into jb-mr1-dev 2012-09-16 00:05:46 -07:00
Dianne Hackborn
5dc5a00e7e More multi-user stuff. 
- New public APIs to find out when a user goes to the foreground,
  background, and is first initializing.
- New activity manager callback to be involved in the user switch
  process, allowing other services to let it know when it is safe
  to stop freezing the screen.
- Wallpaper service now implements this to handle its user switch,
  telling the activity manager when it is done.  (Currently this is
  only handling the old wallpaper going away, we need a little more
  work to correctly wait for the new wallpaper to get added.)
- Lock screen now implements the callback to do its user switch.  It
  also now locks itself when this happens, instead of relying on
  some other entity making sure it is locked.
- Pre-boot broadcasts now go to all users.
- WallpaperManager now has an API to find out if a named wallpaper is
  in use by any users.

Change-Id: I27877aef1d82126c0a1428c3d1861619ee5f8653
 2012-09-15 23:58:55 -07:00
Jeff Sharkey
d0c6ccbafd Move NetworkPolicy from apps to UID. 
For multi-user devices, switch to storing policy per-user instead of
per-app.  Also watch for user added/removed broadcasts to clean up
policies and apply global restrictions.

Bug: 7121279
Change-Id: Ia7326bd0ebe0586fa4ec6d3a62f6313dc8814007
 2012-09-14 23:00:27 -07:00
Elliott Hughes
c3ff72f5bd Use icu4c for CLDR "yesterday", "today", and "tomorrow" strings. 
(cherry-pick of 47a0539ecaf7d7a15008704bd89f748aebf85d47.)

Conflicts:

	core/res/res/values/public.xml

Bug: 6811501
Change-Id: Ifb2e030a9fda85a7f664feac812b63e67780e68f
 2012-09-14 20:22:17 -07:00
Elliott Hughes
08153ee01e Switch DateUtils and Time over to using the CLDR for all week and month names. 
(cherry-pick of 99c406e42ba154584070ca7ec100e8be7ff8a800.)

Conflicts:

	core/res/res/values-fa/donottranslate-cldr.xml
	core/res/res/values/public.xml

Bug: 6811501
Change-Id: I2ad9608ae34804e02c6b0271197e96611df12b0a
 2012-09-14 20:22:17 -07:00
Elliott Hughes
23321b8857 Merge "Use ICU's CLDR data for "AM" and "PM" strings." into jb-mr1-dev 2012-09-14 18:56:15 -07:00
Christopher Tate
2892dfbeaf Merge "Fix default population of wifi settings" into jb-mr1-dev 2012-09-14 17:59:00 -07:00
Christopher Tate
6f5a9a9652 Fix default population of wifi settings 
Various wifi settings that are explicitly defaulted did not get their
default code properly converted to refer to the correct settings
database table.

A collection of moved-to-Global settings that had not yet been
marked @deprecated in the Secure.* namespace are now so marked.

Also updated the namespace used to refer to wifi settings from the
Wifi Service.  These changes are cosmetic, but they do eliminate a
number of runtime log messages.

Bug 7153671

Change-Id: I9e5b6464d025cfb480ef97373996e38e82f90593
 2012-09-14 17:57:35 -07:00
Elliott Hughes
4af85345e7 Use ICU's CLDR data for "AM" and "PM" strings. 
This brings DateUtils and Time in sync with bionic, icu, WebKit,
DateFormatSymbols, Formatter, and SimpleDateFormat. And specifically
means that DateUtils now knows how to say "AM" and "PM" in Japanese.

Bug: 6719054

(cherry-pick of b12b61a88a029730b1f2b006ff914c9c719f3942.)

Conflicts:

	core/res/res/values/public.xml

Change-Id: Ic1a811621a0ec338abd77458ac2046577f87c1e4
 2012-09-14 17:10:00 -07:00
Geremy Condra
74a550fac7 Merge "Change verifyServerDomainAndCertificates to pass in a hostname." into jb-mr1-dev 2012-09-14 17:07:33 -07:00
Kenny Root
1c9894aa7f Merge "Remove AndroidKeyStore from API" into jb-mr1-dev 2012-09-14 16:55:47 -07:00
Geremy Condra
f743e54f2d Change verifyServerDomainAndCertificates to pass in a hostname. 
This is required for cert pinning.

Change-Id: I16041f17e97d9ae592a2b809f6a8164268338d1b
 2012-09-14 16:43:52 -07:00
Elliott Hughes
9ceede6d7e am 086676a4: am f5437ee8: am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use." 
* commit '086676a4a669b5d3a90c01e4d88ab8d628ca65f0':
  Deprecate those parts of DateUtils the documentation says not to use.
 2012-09-14 16:39:12 -07:00
Elliott Hughes
086676a4a6 am f5437ee8: am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use." 
* commit 'f5437ee86a34751fa6d441b95282feb315e19eb6':
  Deprecate those parts of DateUtils the documentation says not to use.
 2012-09-14 16:36:33 -07:00
Elliott Hughes
f5437ee86a am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use." 
* commit '297ad257464d2ea65cabd45ddb19f6da34b39157':
  Deprecate those parts of DateUtils the documentation says not to use.
 2012-09-14 16:34:41 -07:00
Kenny Root
ce24985ad6 Remove AndroidKeyStore from API 
Change-Id: Ibe09d78e5a5b86604f01144f344525bff94c2dde
 2012-09-14 16:23:37 -07:00