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

124241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
c2016d4073 Add DatePickerDialog to layoutlib 
Includes android.app.DatePickerDialog in the layoutlib.jar

Bug: http://b.android.com/28318
Change-Id: I583dde4a8b88204bf98bfca8d91470e1aa4719ce
 2014-02-25 15:31:49 -08:00
ztenghui
8198c3a8f5 Merge "Use pre-computed index to draw the shadow." 2014-02-25 23:20:06 +00:00
ztenghui
63d41abb40 Use pre-computed index to draw the shadow. 
Also draw the umbra part as triangle fans instead of zig zag fashion.

b/12840179

Change-Id: Iaa5d15e77351acdd71f076bd8f9bb2d4d2b92faf
 2014-02-25 14:18:25 -08:00
Jeff Davidson
df08d1c24d Add --replace-version flag to aapt. 
Motivation: we'd like to programmatically specify the version
name/code (i.e. to include the build number from the build server).
However, this means that we cannot specify version info in the
AndroidManifest.xml file, as this takes precedence. Not doing so makes
IDE use more difficult, as the IDE gets version code 0 and won't
install over an existing non-IDE version unless you first force a
downgrade to an IDE build from the command line.

This flag allows us to specify a very high version code in the
AndroidManifest.xml file, making IDE builds take precedence, while
still allowing us to override this info when performing command-line
(official) builds.

Change-Id: I5d01048698af5c26bdf19066c6cd4eca1115112a
 2014-02-25 13:42:12 -08:00
Dianne Hackborn
a1f1a3c573 More battery stats. 
- Add events for sync.
- Add more descriptive tags for wake events.
- Fix battery reset.
- Fix tracking of wifi data.

Change-Id: Ic07f2a86a5ed33e7da57eb1108c31c777ecd801f
 2014-02-25 13:20:07 -08:00
Craig Mautner
24bcc34f78 am 97686e00: am 91df7766: am 42ec5035: Modify API to hide ActivityView. 
* commit '97686e00233f6475bd4a5a48bc718fcf88bbf688':
  Modify API to hide ActivityView.
 2014-02-25 20:29:33 +00:00
Craig Mautner
97686e0023 am 91df7766: am 42ec5035: Modify API to hide ActivityView. 
* commit '91df776654e5cf66e5115e0c46ecdbe19a55a0bc':
  Modify API to hide ActivityView.
 2014-02-25 20:25:55 +00:00
Craig Mautner
91df776654 am 42ec5035: Modify API to hide ActivityView. 
* commit '42ec5035672fbfe701ddbf90dcc4390dab9188af':
  Modify API to hide ActivityView.
 2014-02-25 20:22:28 +00:00
Craig Mautner
42ec503567 Modify API to hide ActivityView. 
Fixes build too.

Change-Id: Ibd571cf36c89691a37c45db59c31237fee17adac
 2014-02-25 12:17:15 -08:00
John Spurlock
a77cf87354 Merge "Tabs -> spaces in frameworks/base." 2014-02-25 19:57:33 +00:00
Martijn Coenen
6924c4ef8d Fix NFC docs breakage. 
Change-Id: I680dc7974316c77cb1835b5a81f30e6961ba3c49
 2014-02-25 11:51:11 -08:00
George Mount
f10587faad Change Activity Scene Transitions to be more automatic. 
Shared element transitions are enabled by default
when the Window has a TransitionManager.

Shared element location and size are captured and
transferred to the target Activity.

ActionBar is treated as a shared element.

Change-Id: I0f22ea4e5cbe80254e848444e3f235cb742684f4
 2014-02-25 11:12:16 -08:00
Mike Lockwood
6c93e4a98e Merge "Fix accessorychat test program" 2014-02-25 19:01:24 +00:00
Mike Lockwood
2280c18826 Fix accessorychat test program 
Change-Id: Ib51b880f64b13e860721d594c900b45d5725b718
 2014-02-25 11:00:41 -08:00
Dan Sandler
2b733f85e2 Merge "Fix boot crash on devices defaulting to landscape." 2014-02-25 18:59:31 +00:00
Craig Mautner
b5abedbd5c am c407ace3: am d4c819c0: am dd9ce628: Merge "Clean up activities and displays when done" into klp-modular-dev 
* commit 'c407ace3019c4e542654cf17fd04d9436d3f3436':
  Clean up activities and displays when done
 2014-02-25 18:56:11 +00:00
Craig Mautner
c407ace301 am d4c819c0: am dd9ce628: Merge "Clean up activities and displays when done" into klp-modular-dev 
* commit 'd4c819c0029da8fb7248564aefde2146d5ecfc19':
  Clean up activities and displays when done
 2014-02-25 18:52:55 +00:00
Craig Mautner
d4c819c002 am dd9ce628: Merge "Clean up activities and displays when done" into klp-modular-dev 
* commit 'dd9ce6287eb9ccae8d527e6750c91b0bd47834fc':
  Clean up activities and displays when done
 2014-02-25 18:49:37 +00:00
Craig Mautner
dd9ce6287e Merge "Clean up activities and displays when done" into klp-modular-dev 2014-02-25 18:46:01 +00:00
Martijn Coenen
c197019054 Merge "Add an API to manually invoke Android Beam." 2014-02-25 18:43:37 +00:00
Craig Mautner
95da1087ed Clean up activities and displays when done 
More maintenance fixes.

Fix bug 13157352.

Change-Id: Ic86d39a84452a1cf1dc1762cec517b419ad0a852
 2014-02-25 10:40:18 -08:00
Robert Greenwalt
7d99b5a4e1 am 8395aadb: (-s ours) am 860ac9e4: am 41c684a7: am 0d39ef72: am cf73f46a: am 43ec3b93: am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '8395aadbd3b2a11fac664f44c590576141c78615':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 18:36:45 +00:00
Robert Greenwalt
8395aadbd3 am 860ac9e4: am 41c684a7: am 0d39ef72: am cf73f46a: am 43ec3b93: am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '860ac9e45f496604757cb27f248def98878f82bb':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 18:33:28 +00:00
Robert Greenwalt
860ac9e45f am 41c684a7: am 0d39ef72: am cf73f46a: am 43ec3b93: am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '41c684a7b5602991cb1af63b2bcaa4e41812dfb9':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 18:29:25 +00:00
Robert Greenwalt
41c684a7b5 am 0d39ef72: am cf73f46a: am 43ec3b93: am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '0d39ef72112972dfadd70ef14c733672e4a2d646':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 18:25:11 +00:00
Robert Greenwalt
0d39ef7211 am cf73f46a: am 43ec3b93: am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit 'cf73f46a514f5c2b1a0de137ed203401417307b4':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 18:21:50 +00:00
Robert Greenwalt
cf73f46a51 am 43ec3b93: am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '43ec3b939b732ea2d3b26635c51a6c91f2692270':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 18:18:05 +00:00
Robert Greenwalt
43ec3b939b am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '1f9ebc5fa73e7d324429a697cd10abb3761b1ff0':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 18:14:26 +00:00
Robert Greenwalt
1f9ebc5fa7 am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '868d4c341034de6e2ebb6c1a247488b00d17c78d':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 10:12:35 -08:00
Robert Greenwalt
868d4c3410 am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '950230663fb3a9af438ec2ee57605fc9e7a58428':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 10:09:13 -08:00
Hui Lu
d22f23b2d6 am fcf7d3a6: am eeb291b7: am 95e3cba1: Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev 
* commit 'fcf7d3a64947a8a0f05ee9e0669abe4a0727f926':
  Reconnect/teardown proxy network connectivity.
 2014-02-25 18:03:07 +00:00
Hui Lu
fcf7d3a649 am eeb291b7: am 95e3cba1: Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev 
* commit 'eeb291b7f36d63c3db467cc7f4be61af09aa3171':
  Reconnect/teardown proxy network connectivity.
 2014-02-25 18:00:05 +00:00
Hui Lu
eeb291b7f3 am 95e3cba1: Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev 
* commit '95e3cba1f66af5594b5bdc210426ced44dd7b7ac':
  Reconnect/teardown proxy network connectivity.
 2014-02-25 17:56:42 +00:00
Hui Lu
95e3cba1f6 Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev 2014-02-25 17:53:41 +00:00
Baligh Uddin
e794dd5c52 Merge "Import translations. DO NOT MERGE" 2014-02-25 17:16:07 +00:00
Dan Sandler
ef1bcec0f5 Fix boot crash on devices defaulting to landscape. 
This is probably not what keyguard_simple_host_view should
look like in landscape, but we need the resource.

Bug: 13185323
Change-Id: Ib044db1f86510128d27ecf45546398c7c1b81aa4
 2014-02-25 12:11:05 -05:00
Baligh Uddin
dfbd5b750f Merge "Import translations. DO NOT MERGE" 2014-02-25 17:04:44 +00:00
John Spurlock
737eb4d867 Merge "Remove unused animations." 2014-02-25 16:46:34 +00:00
John Spurlock
81de6716a5 Remove unused animations. 
Change-Id: I7c34732c6bc8263c42461325437c90a06214d04a
 2014-02-25 11:08:35 -05:00
Mike Lockwood
4495c86dbf am f2d07694: am 6eff9949: am 0fc59cd9: am da2bbaf2: am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev 
* commit 'f2d07694d05240b039bd02cf3982941c0435c33d':
  UsbDeviceManager: Fix race condition entering USB accessory mode
 2014-02-25 15:54:25 +00:00
Mike Lockwood
f2d07694d0 am 6eff9949: am 0fc59cd9: am da2bbaf2: am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev 
* commit '6eff99494dd7b274b3b9f89c64ece6cabaff5c8e':
  UsbDeviceManager: Fix race condition entering USB accessory mode
 2014-02-25 15:51:18 +00:00
Mike Lockwood
6eff99494d am 0fc59cd9: am da2bbaf2: am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev 
* commit '0fc59cd958b87d015deac63797fcbfbcec518389':
  UsbDeviceManager: Fix race condition entering USB accessory mode
 2014-02-25 15:48:03 +00:00
Mike Lockwood
0fc59cd958 am da2bbaf2: am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev 
* commit 'da2bbaf219117f7507c5c0015c41347a9cc27507':
  UsbDeviceManager: Fix race condition entering USB accessory mode
 2014-02-25 15:44:24 +00:00
Mike Lockwood
da2bbaf219 am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev 
* commit '2c7b913e367670dde337893efd59029c054019fc':
  UsbDeviceManager: Fix race condition entering USB accessory mode
 2014-02-25 15:41:11 +00:00
Mike Lockwood
2c7b913e36 am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev 
* commit '5daec5b58a89779b0f8775f52859bae0bda17b23':
  UsbDeviceManager: Fix race condition entering USB accessory mode
 2014-02-25 15:38:25 +00:00
Mike Lockwood
5daec5b58a Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev 2014-02-25 15:35:34 +00:00
John Spurlock
8a985d24ce Tabs -> spaces in frameworks/base. 
Change-Id: I5a84e8e93ac99b5ed0212b37bf66efa5e53864be
 2014-02-25 09:49:29 -05:00
Narayan Kamath
deaa6cc34d am cc99b18c: am a6f70d8b: am 7fe5978b: am 2ba70fd4: Merge "Use reinterpret_cast when an integer is cast to a pointer" 
* commit 'cc99b18ce30e6847bd9b29129755f63efd4f06fe':
  Use reinterpret_cast when an integer is cast to a pointer
 2014-02-25 13:20:52 +00:00
Narayan Kamath
58908b02f3 am d8410d38: am 614b00de: am a88abfb3: am 6ab07fac: Merge "Use long for pointers in opengl/EGL classes" 
* commit 'd8410d38cf2eb133dab29aec722dce862584d115':
  Use long for pointers in opengl/EGL classes
 2014-02-25 13:20:47 +00:00
Narayan Kamath
cc99b18ce3 am a6f70d8b: am 7fe5978b: am 2ba70fd4: Merge "Use reinterpret_cast when an integer is cast to a pointer" 
* commit 'a6f70d8b2dc2a2d900dfaa4b3fcd0fbdffdcfb9e':
  Use reinterpret_cast when an integer is cast to a pointer
 2014-02-25 13:17:39 +00:00