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

105962 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tsu Chiang Chuang
85c5f084e5 am e325f13c: am 4e0ae8d6: Merge "Make sure the app is still app after launching. Bug:8755950" into jb-mr2-dev 
* commit 'e325f13cf0a06b98e2a638784cd75c0c04f90956':
  Make sure the app is still app after launching. Bug:8755950
 2013-05-01 14:18:51 -07:00
Tsu Chiang Chuang
e325f13cf0 am 4e0ae8d6: Merge "Make sure the app is still app after launching. Bug:8755950" into jb-mr2-dev 
* commit '4e0ae8d6fdc4646a90949ddf95fd8d1f7a22055a':
  Make sure the app is still app after launching. Bug:8755950
 2013-05-01 14:14:01 -07:00
Elliott Hughes
6d82f86fa0 Merge "Show CJK dates as all-numeric in the DatePicker." 2013-05-01 21:12:38 +00:00
Tsu Chiang Chuang
4e0ae8d6fd Merge "Make sure the app is still app after launching. Bug:8755950" into jb-mr2-dev 2013-05-01 21:12:31 +00:00
Elliott Hughes
949e9df25b Show CJK dates as all-numeric in the DatePicker. 
Before, we'd have something like 2006 4月12. After, we have 2006 4 12.
The alternative would require using custom NumberPicker.Formatter instances
for the year and day fields in these locales, and that seems significantly
more disruptive.

Bug: 8766552
Change-Id: I568578aae2f80f2acfc53cd277ef3beae6743472
 2013-05-01 14:12:05 -07:00
Mike J. Chen
1d507f7b9b am 94264d52: am 2f4cc8ea: Merge "Fix a crash case" into jb-mr2-dev 
* commit '94264d522efcc21ac749a6444fbea90916f575c9':
  Fix a crash case
 2013-05-01 14:04:59 -07:00
Dmitry Shmidt
3bb591abb7 Merge "framework: When turn off of SoftAp immediately call turning ON SoftAp" 2013-05-01 21:02:36 +00:00
Mike J. Chen
94264d522e am 2f4cc8ea: Merge "Fix a crash case" into jb-mr2-dev 
* commit '2f4cc8eacfe819a4f54aa4b0318ad1d31ecc2a40':
  Fix a crash case
 2013-05-01 14:02:32 -07:00
Mike J. Chen
2f4cc8eacf Merge "Fix a crash case" into jb-mr2-dev 2013-05-01 20:59:12 +00:00
Adam Koch
155c095502 am 2046a8f1: am 7521541c: am 53e8587b: am 58a6e5c0: am 4f221669: am 1d71751f: am bbed0513: Contacts Provider Training - fix minor code snippet typos. 
* commit '2046a8f1572df95bbb46a47d96dab06666d743de':
  Contacts Provider Training - fix minor code snippet typos.
 2013-05-01 13:30:50 -07:00
Adam Koch
2046a8f157 am 7521541c: am 53e8587b: am 58a6e5c0: am 4f221669: am 1d71751f: am bbed0513: Contacts Provider Training - fix minor code snippet typos. 
* commit '7521541c2a26d29c28c6b1bd60fc4550e5eb5c49':
  Contacts Provider Training - fix minor code snippet typos.
 2013-05-01 13:28:37 -07:00
Adam Koch
7521541c2a am 53e8587b: am 58a6e5c0: am 4f221669: am 1d71751f: am bbed0513: Contacts Provider Training - fix minor code snippet typos. 
* commit '53e8587bedda3beef34e060f7256261d53f30697':
  Contacts Provider Training - fix minor code snippet typos.
 2013-05-01 13:24:40 -07:00
Adam Koch
53e8587bed am 58a6e5c0: am 4f221669: am 1d71751f: am bbed0513: Contacts Provider Training - fix minor code snippet typos. 
* commit '58a6e5c0d1406cab6c70b397b0b4252e5da66743':
  Contacts Provider Training - fix minor code snippet typos.
 2013-05-01 13:20:21 -07:00
Adam Koch
58a6e5c0d1 am 4f221669: am 1d71751f: am bbed0513: Contacts Provider Training - fix minor code snippet typos. 
* commit '4f2216691a3df241977f39102b7eafc68556f477':
  Contacts Provider Training - fix minor code snippet typos.
 2013-05-01 13:14:49 -07:00
Adam Koch
4f2216691a am 1d71751f: am bbed0513: Contacts Provider Training - fix minor code snippet typos. 
* commit '1d71751fc20a2c52e04656af409fa97a6f7c15c5':
  Contacts Provider Training - fix minor code snippet typos.
 2013-05-01 13:13:02 -07:00
Casey Burkhardt
96c5416472 am 4c8fc9f0: am e8569117: Merge "Properly populates AccessibilityEvents for notification and quick settings shades" into jb-mr2-dev 
* commit '4c8fc9f067dec773f6030a291477e396030e55b7':
  Properly populates AccessibilityEvents for notification and quick settings shades
 2013-05-01 12:37:10 -07:00
Casey Burkhardt
4c8fc9f067 am e8569117: Merge "Properly populates AccessibilityEvents for notification and quick settings shades" into jb-mr2-dev 
* commit 'e85691176261baca50aff1284c01880dc2188a81':
  Properly populates AccessibilityEvents for notification and quick settings shades
 2013-05-01 12:35:17 -07:00
Casey Burkhardt
e856911762 Merge "Properly populates AccessibilityEvents for notification and quick settings shades" into jb-mr2-dev 2013-05-01 19:33:08 +00:00
Craig Mautner
c63bda0bd1 Merge "Handle case where finishActivity removes activity" 2013-05-01 19:02:29 +00:00
Craig Mautner
d94b1b480e Handle case where finishActivity removes activity 
Fixes bug 8773046.

Change-Id: I2e9f15c19ee9b50347472542ace5287964964203
 2013-05-01 11:58:03 -07:00
Adam Koch
1d71751fc2 am bbed0513: Contacts Provider Training - fix minor code snippet typos. 
* commit 'bbed0513abb1d98733f0eed5399f4cb195fda55f':
  Contacts Provider Training - fix minor code snippet typos.
 2013-05-01 11:52:26 -07:00
Jeff Sharkey
776069facf am a49cea63: am 033168b1: Merge "Lockdown VPN handles its own connection teardown." into jb-mr2-dev 
* commit 'a49cea63a080b7c5f884626ba3c0309cb6e49f99':
  Lockdown VPN handles its own connection teardown.
 2013-05-01 11:33:25 -07:00
Craig Mautner
c66a83751a Merge "Do not return to Home activity if not top task." 2013-05-01 18:32:33 +00:00
Craig Mautner
a1c12b2cae Merge "Move task methods into TaskRecord." 2013-05-01 18:32:06 +00:00
Jeff Sharkey
a49cea63a0 am 033168b1: Merge "Lockdown VPN handles its own connection teardown." into jb-mr2-dev 
* commit '033168b1b0e6fc24a01bef6ec65948663f0ad3b7':
  Lockdown VPN handles its own connection teardown.
 2013-05-01 11:31:41 -07:00
Craig Mautner
7085759954 Merge "A better fix for bug 8740202." 2013-05-01 18:31:31 +00:00
Jeff Sharkey
033168b1b0 Merge "Lockdown VPN handles its own connection teardown." into jb-mr2-dev 2013-05-01 18:30:23 +00:00
Craig Mautner
9e14d0fd9a Do not return to Home activity if not top task. 
Add a test for being the top task when closing the last activity in a
task. Without this test, if the last activity in a task was flagged to
return to the home activity on completion but that activity had
launched a new task we would not go to the new task but would instead
launch the home activity.

Fixes bug 8775949.

Change-Id: I7fd9d9ebbdbff8064d894407c35190894a141ecf
 2013-05-01 11:26:09 -07:00
gcondra@google.com
da1bb7cdbf am 334c04e2: am bb1a6244: Merge "Fix an NPE and fd leak in SELinux policy updater." into jb-mr2-dev 
* commit '334c04e2f0eb62c6c9db73da0ec0021abffceb92':
  Fix an NPE and fd leak in SELinux policy updater.
 2013-05-01 11:15:38 -07:00
gcondra@google.com
334c04e2f0 am bb1a6244: Merge "Fix an NPE and fd leak in SELinux policy updater." into jb-mr2-dev 
* commit 'bb1a6244d169bbbf06068b5dce47c51c98097c89':
  Fix an NPE and fd leak in SELinux policy updater.
 2013-05-01 11:14:06 -07:00
repo sync
bb1a6244d1 Merge "Fix an NPE and fd leak in SELinux policy updater." into jb-mr2-dev 2013-05-01 18:12:04 +00:00
Scott Main
47dcb66610 dashboard update for 5/1 
Change-Id: I9cdcf2934a5332fee50067e0b6f8f3f159373892
 2013-05-01 10:32:47 -07:00
Jeff Sharkey
57666934b4 Lockdown VPN handles its own connection teardown. 
Recent changes started watching for CONNECTIVITY_ACTION broadcasts
to handle the case where a network is disconnected without the
interface going down.

However, when lockdown VPN is enabled, the broadcast contents are
augmented, and all connections appear disconnected until the VPN
comes online.  This caused a reset feedback loop to occur.

Since LockdownVpnTracker already handles networks being disconnected
separately from interfaces going down, this change disables handling
the broadcast when lockdown is enabled.

Bug: 8755148
Change-Id: I70a348aa97a4b22eaaf23aa5ed344de3e9a9ab0b
 2013-05-01 09:40:50 -07:00
Baligh Uddin
2e29cdae53 Merge "Import translations. DO NOT MERGE" 2013-05-01 16:21:45 +00:00
Adam Koch
bbed0513ab Contacts Provider Training - fix minor code snippet typos. 
Change-Id: I3edf86d276d877914a3d97e596e1bb35d1b1ce1f
 2013-05-01 12:21:20 -04:00
Baligh Uddin
01ad25eb8e Merge "Import translations. DO NOT MERGE" 2013-05-01 16:20:16 +00:00
Baligh Uddin
918200edf7 Import translations. DO NOT MERGE 
Change-Id: Ia6b724bc2426c4248b3b83569f21dd0ffe91bb3a
Auto-generated-cl: translation import
 2013-05-01 08:45:23 -07:00
Baligh Uddin
4946128d64 Import translations. DO NOT MERGE 
Change-Id: I247665db04a208df5ea3681001855b1321341a55
Auto-generated-cl: translation import
 2013-05-01 08:18:40 -07:00
Baligh Uddin
4431de13bb Import translations. DO NOT MERGE 
Change-Id: I5f6ba8997fc6d041d18e6c2103cc3c0fc7d83ee8
Auto-generated-cl: translation import
 2013-05-01 08:17:11 -07:00
Tsu Chiang Chuang
14c716be79 Make sure the app is still app after launching. 
Bug:8755950

Change-Id: Ie30d84cb94787d8b2e7bdc65e329a311581f4a3f
 2013-05-01 07:54:48 -07:00
Jesse Hall
fcafc3259e am 0b30ad53: am 09f3cc2b: Merge "Fix GLES30 JNI registration" into jb-mr2-dev 
* commit '0b30ad53423a9bfab53b1632a33159be3d82e3df':
  Fix GLES30 JNI registration
 2013-04-30 19:38:14 -07:00
Jesse Hall
0b30ad5342 am 09f3cc2b: Merge "Fix GLES30 JNI registration" into jb-mr2-dev 
* commit '09f3cc2bcca62fea30dc0f22cc120088e9f54728':
  Fix GLES30 JNI registration
 2013-04-30 19:36:03 -07:00
Jesse Hall
09f3cc2bcc Merge "Fix GLES30 JNI registration" into jb-mr2-dev 2013-05-01 02:31:55 +00:00
Romain Guy
e72bd54302 am fa4eb085: am b107b7e9: Merge "Prevent TextureView from ever setting a null layer paint Bug #8760436" into jb-mr2-dev 
* commit 'fa4eb085c3f01c0b659c37be585c13f0a9a3b360':
  Prevent TextureView from ever setting a null layer paint Bug #8760436
 2013-04-30 18:19:34 -07:00
Romain Guy
fa4eb085c3 am b107b7e9: Merge "Prevent TextureView from ever setting a null layer paint Bug #8760436" into jb-mr2-dev 
* commit 'b107b7e9ecaee799a7a18b8ab897969ef554fd9b':
  Prevent TextureView from ever setting a null layer paint Bug #8760436
 2013-04-30 18:16:11 -07:00
Romain Guy
b107b7e9ec Merge "Prevent TextureView from ever setting a null layer paint Bug #8760436" into jb-mr2-dev 2013-05-01 01:14:41 +00:00
Christopher Tate
9f9dc4b230 am 6e629e84: am 95a9bfe2: When installing/enabling a system app, bootstrap it 
* commit '6e629e84c52c870ff6fe6d0493861997929209f4':
  When installing/enabling a system app, bootstrap it
 2013-04-30 17:50:50 -07:00
Christopher Tate
6e629e84c5 am 95a9bfe2: When installing/enabling a system app, bootstrap it 
* commit '95a9bfe2ba75d79fff8157ed57e75c4ffb5a08ac':
  When installing/enabling a system app, bootstrap it
 2013-04-30 17:48:59 -07:00
Christopher Tate
95a9bfe2ba When installing/enabling a system app, bootstrap it 
Specifically, send it a BOOT_COMPLETED broadcast just as it would have
received during device (or user) startup.

Bug 8594153

Change-Id: I847c16df56d038a25758e594f951bc15348edc19
 2013-04-30 17:40:32 -07:00
repo sync
f7b8bc48af Fix an NPE and fd leak in SELinux policy updater. 
Bug: 8769213
Change-Id: Iff80be6109a1586d818754c8f9f5053b816fbd57
 2013-04-30 17:37:00 -07:00